diff mbox series

[RFC,4/5] Android.mk: Add option to use vendor version of mesa

Message ID 1532474502-17657-5-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: Yong Yao <yong.yao@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.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: Harish Krupo <harish.krupo.kps@intel.com>

Signed-off-by: Yong Yao <yong.yao@intel.com>

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

---
 Android.mk | 3 +++
 1 file changed, 3 insertions(+)

-- 
2.7.4
diff mbox series

Patch

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