summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Strachan <astrachan@google.com>2018-05-17 10:58:04 -0700
committerAlistair Strachan <astrachan@google.com>2018-05-18 00:49:44 +0000
commitd7f894a7d39e66ca5a832c19edaf175400041aff (patch)
treebfbec9c8f13910c8cc0aa9caee9e893c79ffad7c
parent662491d22c7a48a0e1f9efd39427be7582570498 (diff)
Fix checkbuild on Mac builders.
The libmesa_dri_common target depends on xgettext unconditionally, but this is not a documented dependency of AOSP and is not installed on the Mac builders, so we must not build any part of mesa3d on these platforms. Bug: 79909534 Bug: 79165890 Change-Id: Ice7129f046ca823e80132e34911c9bb8f1226b4c Signed-off-by: Alistair Strachan <astrachan@google.com>
-rw-r--r--Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 5ccd00838c..128db4d14e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,6 +30,7 @@
# module will also be built. DRI modules will be loaded by libGLES_mesa.
ifneq ($(BOARD_USE_CUSTOMIZED_MESA), true)
+ifneq ($(BOARD_GPU_DRIVERS),)
MESA_TOP := $(call my-dir)
@@ -128,4 +129,5 @@ INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))
INC_DIRS += $(call all-named-subdir-makefiles,src/gallium)
include $(INC_DIRS)
-endif
+endif # BOARD_GPU_DRIVERS != ""
+endif # BOARD_USE_CUSTOMIZED_MESA != true