[Intel-gfx] [PATCH i-g-t v3] Android.mk: Disable tools that do not build for android

[Thomas Wood]

On 17 July 2015 at 10:15, Derek Morton <derek.j.morton at intel.com> wrote:
> Disable the tools / demo code that do not currently build
> for android until they can be fixed.
>
> Affected tools / demos
> intel_display_crc
> intel_sprite_on
>
> v2: intel_display_crc compiled conditionally on ANDROID_HAS_CAIRO
> flag.
> v3: removed intel_reg from the skip list as Thomas has prepared
> a patch to fix it for Android.
>
> Signed-off-by: Derek Morton <derek.j.morton at intel.com>
> ---
>  Android.mk       | 2 +-
>  tools/Android.mk | 4 ++++
>  2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/Android.mk b/Android.mk
> index 1ab3e64..681d114 100644
> --- a/Android.mk
> +++ b/Android.mk
> @@ -1,2 +1,2 @@
> -include $(call all-named-subdir-makefiles, lib tests tools benchmarks demos)
> +include $(call all-named-subdir-makefiles, lib tests tools benchmarks)

This essentially just disables building intel_sprite_on. Does the
comment in commit 6999b70 no longer apply?


>
> diff --git a/tools/Android.mk b/tools/Android.mk
> index 39f4512..b5f8008 100644
> --- a/tools/Android.mk
> +++ b/tools/Android.mk
> @@ -41,6 +41,10 @@ skip_tools_list := \
>      intel_vga_read \
>      intel_vga_write
>
> +ifneq ("${ANDROID_HAS_CAIRO}", "1")
> +    skip_tools_list += intel_display_crc
> +endif
> +
>  tools_list := $(filter-out $(skip_tools_list),$(bin_PROGRAMS))
>
>  $(foreach item,$(tools_list),$(eval $(call add_tool,$(item))))
> --
> 1.9.1
>