X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Android.mk;h=aa2e7f7610efa671a2d2cf8d93daf76031a0a806;hb=454bc595d184da6f9567b6a3451c87616ddb6e79;hp=c15c2b78bacf19f129122ed5c52fd71617b949cc;hpb=cad400a59e47461f4965cfd19882c680cc111d94;p=mesa.git

diff --git a/Android.mk b/Android.mk
index c15c2b78bac..aa2e7f7610e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -44,6 +44,11 @@ MESA_DRI_LDFLAGS := -Wl,--build-id=sha1
 MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
 MESA_PYTHON2 := python
 MESA_PYTHON3 := python3
+ifeq ($(filter 5 6 7 8 9 10, $(MESA_ANDROID_MAJOR_VERSION)),)
+MESA_LEX     := M4=$(M4) $(LEX)
+else
+MESA_LEX     := $(LEX)
+endif
 
 # Lists to convert driver names to boolean variables
 # in form of <driver name>.<boolean make variable>
@@ -92,7 +97,7 @@ endif
 define mesa-build-with-llvm
   $(if $(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7), \
     $(warning Unsupported LLVM version in Android $(MESA_ANDROID_MAJOR_VERSION)),) \
-  $(eval LOCAL_CFLAGS += -DLLVM_AVAILABLE -DMESA_LLVM_VERSION_STRING=\"3.9\") \
+  $(eval LOCAL_CFLAGS += -DLLVM_AVAILABLE -DLLVM_IS_SHARED=1 -DMESA_LLVM_VERSION_STRING=\"3.9\") \
   $(eval LOCAL_SHARED_LIBRARIES += libLLVM)
 endef