From bcd3e1f33f136399659c7b1549be3bae467abaf4 Mon Sep 17 00:00:00 2001 From: Derek Morton Date: Wed, 9 Sep 2015 17:51:35 +0100 Subject: 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 Signed-off-by: Thomas Wood --- tools/Android.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'tools') diff --git a/tools/Android.mk b/tools/Android.mk index 0a196e46..934d3a16 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -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 \ -- cgit v1.2.3