commit 48d0b9cbac5325966984cb48d9771057a44070ea
author android-build-team Robot <android-build-team-robot@google.com> Wed Dec 06 08:22:23 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Dec 06 08:22:23 2017 +0000
tree 55208e8e09096fa31215fcac02c345baf19ed0ae
parent a7c09f27a67b288214a9d0e326b8370f134eecd5
parent 60553a9cd0aba167e1cce730e4ca63ee4b702abc

Snap for 4486962 from 60553a9cd0aba167e1cce730e4ca63ee4b702abc to pi-release

Change-Id: If3cf9d5fd3e9e55b4e1a175946bd7477055dec81

Android.mk

diff --git a/Android.mk b/Android.mk
index ffa6a8f..be51228 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)))
@@ -99,3 +100,4 @@
 include $(INC_DIRS)
 
 endif
+endif