From: Alistair Strachan <astrac...@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.herr...@linaro.org> Cc: Alistair Strachan <astrac...@google.com> Cc: Marissa Wall <maris...@google.com> Cc: Sumit Semwal <sumit.sem...@linaro.org> Cc: Emil Velikov <emil.l.veli...@gmail.com> Cc: Rob Clark <robdcl...@gmail.com> Signed-off-by: Alistair Strachan <astrac...@google.com> Signed-off-by: John Stultz <john.stu...@linaro.org> --- Android.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- 2.7.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
