aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo 'Grim' Cabrita <grimkriegor@krutt.org>2019-07-20 14:12:28 (GMT)
committerRicardo 'Grim' Cabrita <grimkriegor@krutt.org>2019-07-22 17:45:15 (GMT)
commit0caa02f8dc3cef41aaf2d237dd7df572550da90b (patch)
tree177ddef03f9a7b77f22451b8b4e0b5f7c7dd2239
parente0a5e6c056c8281712bf6366acfe876215992613 (diff)
downloadexternal_mesa3d-0caa02f8dc3cef41aaf2d237dd7df572550da90b.zip
external_mesa3d-0caa02f8dc3cef41aaf2d237dd7df572550da90b.tar.gz
external_mesa3d-0caa02f8dc3cef41aaf2d237dd7df572550da90b.tar.bz2
android: Switch LLVM shared lib according to Android version
Android versions 9+ renamed LLVM's shared library module from `libLLVM` to `libLLVM_android`. This commit sets `libLLVM_android` as the new default and allows the `mesa-build-with-llvm` function to switch to `libLLVM` when dealing with Android versions between 6 and 8. Signed-off-by: Ricardo 'Grim' Cabrita <grimkriegor@krutt.org> Acked-by: Mauro Rossi <issor.oruam@gmail.com>
-rw-r--r--Android.mk14
1 files changed, 9 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index 8d274e5..7da17a1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -88,17 +88,21 @@ MESA_ENABLE_LLVM := true
endif
define mesa-build-with-llvm
+ $(eval LLVM_SHARED_LIBRARY := libLLVM_android) \
$(if $(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5), \
$(warning Unsupported LLVM version in Android $(MESA_ANDROID_MAJOR_VERSION)),) \
$(if $(filter 6,$(MESA_ANDROID_MAJOR_VERSION)), \
- $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_STRING=\"3.7\")) \
+ $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_STRING=\"3.7\") \
+ $(eval LLVM_SHARED_LIBRARY := libLLVM)) \
$(if $(filter 7,$(MESA_ANDROID_MAJOR_VERSION)), \
- $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_STRING=\"3.8\")) \
+ $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_STRING=\"3.8\") \
+ $(eval LLVM_SHARED_LIBRARY := libLLVM)) \
$(if $(filter 8,$(MESA_ANDROID_MAJOR_VERSION)), \
+ $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_STRING=\"3.9\") \
+ $(eval LLVM_SHARED_LIBRARY := libLLVM)) \
+ $(if $(filter 9,$(MESA_ANDROID_MAJOR_VERSION)), \
$(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_STRING=\"3.9\")) \
- $(if $(filter P,$(MESA_ANDROID_MAJOR_VERSION)), \
- $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_STRING=\"3.9\")) \
- $(eval LOCAL_SHARED_LIBRARIES += libLLVM)
+ $(eval LOCAL_SHARED_LIBRARIES += $(LLVM_SHARED_LIBRARY))
endef
# add subdirectories