tools/Android.mk: Fix compile error in intel_reg.c
PATCH v2 1/1 tools/Android.mk: Fix compile error in intel_reg.c
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.
v2: Added local variable for tool path
Signed-off-by Derek Morton <[email protected]>
--- tools/Android.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+)
tools/Android.mk +12 -0
@@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/Makefile.sources +LOCAL_TOOLS_DIR := intel/validation/core/igt/tools + #================# define add_tool
@@ -34,11 +36,21 @@ define add_tool libdrm \ libdrm_intel + # Tools dir on host + LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/$(LOCAL_TOOLS_DIR) + # Tools dir on target. + LOCAL_CFLAGS += -DPKGDATADIR=\"/system/vendor/$(LOCAL_TOOLS_DIR)\" + include $(BUILD_EXECUTABLE) endef #================# +# Copy the register files +$(shell mkdir -p $(TARGET_OUT_VENDOR)/$(LOCAL_TOOLS_DIR)/registers) +$(shell cp $(LOCAL_PATH)/registers/* $(TARGET_OUT_VENDOR)/$(LOCAL_TOOLS_DIR)/registers) + + skip_tools_list := \ intel_framebuffer_dump \ intel_reg_dumper \
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx