summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Morton <derek.j.morton@intel.com>2015-07-17 10:15:39 +0100
committerThomas Wood <thomas.wood@intel.com>2015-07-20 18:13:37 +0100
commit3c294a8fa3a3692bab5abe579375edf96ee3b081 (patch)
tree8e32fd7a3dac72b6929f7a02a2417b7b2601a127
parente65c69b995590ccd7f209b1e516819b1248d4e38 (diff)
Android.mk: Disable tools that do not build for android
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@intel.com> Signed-off-by: Thomas Wood <thomas.wood@intel.com>
-rw-r--r--Android.mk2
-rw-r--r--tools/Android.mk4
2 files changed, 5 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 1ab3e646..681d1145 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)
diff --git a/tools/Android.mk b/tools/Android.mk
index fbba579f..6617f287 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -45,6 +45,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))))