diff mbox series

[RFC,5/5] Android.mk: Fix checkbuild on Mac builders.

Message ID 1532474502-17657-6-git-send-email-john.stultz@linaro.org
State New
Headers show
Series Trying to align mesa upstream w/ AOSP/master | expand

Commit Message

John Stultz July 24, 2018, 11:21 p.m. UTC 
From: Alistair Strachan <astrachan@google.com>


This is a forward port of a patch in the AOSP/master tree:
https://android.googlesource.com/platform/external/mesa3d/+/d7f894a7d39e66ca5a832c19edaf175400041aff%5E%21/

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.

Cc: Rob Herring <rob.herring@linaro.org>
Cc: Alistair Strachan <astrachan@google.com>
Cc: Marissa Wall <marissaw@google.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Rob Clark <robdclark@gmail.com>
Signed-off-by: Alistair Strachan <astrachan@google.com>

Signed-off-by: John Stultz <john.stultz@linaro.org>

---
 Android.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 
2.7.4
diff mbox series

Patch

diff --git a/Android.mk b/Android.mk
index 494b4b9..128db4d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,6 +30,8 @@ 
 # 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)
 
 MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
@@ -127,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