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

[Thomas Wood]

On 9 September 2015 at 14:30, Derek Morton <derek.j.morton at intel.com> wrote:
> 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.

Missing Signed-off-by line.

> ---
>  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

Is this part of the same fix?


> +    LOCAL_CFLAGS += -DPKGDATADIR=\"/system/vendor/intel/validation/core/igt/tools\"

This should have /registers on the end. Might be worth having a local
variable to avoid specifying the path explicitly each time.


>      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
>