diff options
| author | Derek Morton <derek.j.morton@intel.com> | 2015-09-09 17:51:35 +0100 |
|---|---|---|
| committer | Thomas Wood <thomas.wood@intel.com> | 2015-09-11 14:39:43 +0100 |
| commit | bcd3e1f33f136399659c7b1549be3bae467abaf4 (patch) | |
| tree | 676dd9709eb5ca6191b3eb6451272ba4928511f5 /tools | |
| parent | 3546514791e159e94ba3baf73cc2bad65a7a0f20 (diff) | |
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 <derek.j.morton@intel.com>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Android.mk | 12 |
1 files changed, 12 insertions, 0 deletions
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 \ |