summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorRoman Stratiienko <r.stratiienko@gmail.com>2021-08-10 13:14:22 +0300
committerMarge Bot <eric+marge@anholt.net>2021-08-16 09:18:46 +0000
commitc3775ac50740161b28bd04cb0c07d739d8db3a2f (patch)
treeb606b95e9b2a41c6ed9a74f48c92b701f02c03d7 /android
parenta70ff21efbb48f851c5cdd10c43c4c8a3d49b071 (diff)
downloadmesa-c3775ac50740161b28bd04cb0c07d739d8db3a2f.tar.gz
mesa-c3775ac50740161b28bd04cb0c07d739d8db3a2f.tar.bz2
mesa-c3775ac50740161b28bd04cb0c07d739d8db3a2f.zip
AOSP: Upgrade libLLVM dependency to v12
Now LLVMv12 seems to be stable enough, so we can upgrade to it. Version adapted for AOSP can be found here [1] [1]: https://github.com/maurossi/llvm-project/tree/release_12.x Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com> Tested-by: Mauro Rossi <issor.oruam@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12304>
Diffstat (limited to 'android')
-rw-r--r--android/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/Android.mk b/android/Android.mk
index ed310929a29..b7ced24d07b 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -74,10 +74,10 @@ MESON_GEN_PKGCONFIGS += libdrm_nouveau:$(LIBDRM_VERSION)
endif
ifneq ($(MESON_GEN_LLVM_STUB),)
-MESON_LLVM_VERSION := 11.0.0
+MESON_LLVM_VERSION := 12.0.0
# Required for swr gallium target
MESON_LLVM_IRBUILDER_PATH := external/llvm-project/llvm/include/llvm/IR/IRBuilder.h
-LOCAL_SHARED_LIBRARIES += libLLVM11
+LOCAL_SHARED_LIBRARIES += libLLVM12
endif
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 30; echo $$?), 0)