[Intel-gfx] [PATCH i-g-t] tools/Android.mk: Fix compile error in intel_reg.c

Derek Morton derek.j.morton at intel.com
Wed Sep 9 06:30:09 PDT 2015


The patch "tools: install the register definition files" caused
a build error on android as it added 'PKGDATADIR' which was not
defined in the Android build environment. This patch adds that
define to tools/Android.mk. It also copies the files it points
to so they are actually in the target file system.
---
 tools/Android.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/Android.mk b/tools/Android.mk
index 0a196e4..aae7db5 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -34,11 +34,18 @@ define add_tool
                               libdrm        \
                               libdrm_intel
 
+    LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/intel/validation/core/igt/tools
+    LOCAL_CFLAGS += -DPKGDATADIR=\"/system/vendor/intel/validation/core/igt/tools\"
     include $(BUILD_EXECUTABLE)
 endef
 
 #================#
 
+# Copy the register files
+$(shell mkdir -p $(TARGET_OUT_VENDOR)/intel/validation/core/igt/tools/registers)
+$(shell cp $(LOCAL_PATH)/registers/* $(TARGET_OUT_VENDOR)/intel/validation/core/igt/tools/registers)
+
+
 skip_tools_list := \
     intel_framebuffer_dump \
     intel_reg_dumper \
-- 
1.9.1



More information about the Intel-gfx mailing list