Signed-off-by: Chih-Wei Huang cwhuang@linux.org.tw --- data/Android.mk | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 data/Android.mk
diff --git a/data/Android.mk b/data/Android.mk new file mode 100644 index 0000000..3c1fd7c --- /dev/null +++ b/data/Android.mk @@ -0,0 +1,9 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_MODULE := amdgpu.ids +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/hwdata +LOCAL_SRC_FILES := $(LOCAL_MODULE) +include $(BUILD_PREBUILT)
Define two macros to avoid building errors.
Fixes: 7e6bf88cac (amdgpu: move asic id table to a separate file)
Signed-off-by: Chih-Wei Huang cwhuang@linux.org.tw --- amdgpu/Android.mk | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk index bf0611b..955bd53 100644 --- a/amdgpu/Android.mk +++ b/amdgpu/Android.mk @@ -10,5 +10,11 @@ LOCAL_SHARED_LIBRARIES := libdrm
LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES)
+LOCAL_CFLAGS := \ + -DAMDGPU_ASIC_ID_TABLE="/etc/hwdata/amdgpu.ids" \ + -DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' $(LIBDRM_TOP)/data/amdgpu.ids) + +LOCAL_REQUIRED_MODULES := amdgpu.ids + include $(LIBDRM_COMMON_MK) include $(BUILD_SHARED_LIBRARY)
On 19 July 2017 at 11:18, Chih-Wei Huang cwhuang@android-x86.org wrote:
Define two macros to avoid building errors.
Fixes: 7e6bf88cac (amdgpu: move asic id table to a separate file)
Signed-off-by: Chih-Wei Huang cwhuang@linux.org.tw
amdgpu/Android.mk | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk index bf0611b..955bd53 100644 --- a/amdgpu/Android.mk +++ b/amdgpu/Android.mk @@ -10,5 +10,11 @@ LOCAL_SHARED_LIBRARIES := libdrm
LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES)
+LOCAL_CFLAGS := \
-DAMDGPU_ASIC_ID_TABLE=\"/etc/hwdata/amdgpu.ids\" \
You want to use the same path in both places like we do in automake - see libdrmdatadir. One simply does not need to bother/track if TARGET_OUT_ETC expands to /etc/ or as mentioned in [1] /system/etc/
-Emil [1] https://source.codeaurora.org/external/gigabyte/ag-gb-dsds-7227/plain/framew...
dri-devel@lists.freedesktop.org
-
Chih-Wei Huang -
Emil Velikov