[PATCH] android: amdgpu: move asic id table to a separate file

Mauro Rossi issor.oruam at gmail.com
Sat Jul 22 09:01:25 UTC 2017


Changes in Android.mk makefile to avoid building errors in mesa
due to missing LOCAL_CFLAGS variable definition for
AMDGPU_ASIC_ID_TABLE and ASIC_ID_TABLE_NUM_ENTRIES

Fixes: 7e6bf88cac ("amdgpu: move asic id table to a separate file")
---
 amdgpu/Android.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk
index bf0611ba..270680bb 100644
--- a/amdgpu/Android.mk
+++ b/amdgpu/Android.mk
@@ -10,5 +10,13 @@ LOCAL_SHARED_LIBRARIES := libdrm
 
 LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES)
 
+ASIC_ID_TABLE_NUM_ENTRIES := $(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' \
+	$(LIBDRM_TOP)/data/amdgpu.ids)
+
+LOCAL_CFLAGS += -DAMDGPU_ASIC_ID_TABLE=\"$(LIBDRM_TOP)/data/amdgpu.ids\" \
+	-DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(ASIC_ID_TABLE_NUM_ENTRIES)
+
+$(intermediates)/amdgpu_asic_id.o: $(LIBDRM_TOP)/data/amdgpu.ids
+
 include $(LIBDRM_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)
-- 
2.11.0



More information about the dri-devel mailing list