From: Yong Yao <yong....@intel.com> This is a forward port of a patch from the AOSP/master branch: https://android.googlesource.com/platform/external/mesa3d/+/b1e5fad1db4c1d51c7ae3a033b100a8429ae5415%5E%21/
Which allows boards to provide their own custom copy of mesa. 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: Harish Krupo <harish.krupo....@intel.com> Signed-off-by: Yong Yao <yong....@intel.com> Signed-off-by: John Stultz <john.stu...@linaro.org> --- Android.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Android.mk b/Android.mk index 914854c..494b4b9 100644 --- a/Android.mk +++ b/Android.mk @@ -29,6 +29,7 @@ # The main target is libGLES_mesa. For each classic driver enabled, a DRI # module will also be built. DRI modules will be loaded by libGLES_mesa. +ifneq ($(BOARD_USE_CUSTOMIZED_MESA), true) MESA_TOP := $(call my-dir) MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION))) @@ -125,3 +126,5 @@ SUBDIRS := \ INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS)) INC_DIRS += $(call all-named-subdir-makefiles,src/gallium) include $(INC_DIRS) + +endif -- 2.7.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev