diff options
author | Rob Herring <robh@kernel.org> | 2017-08-23 12:20:52 -0500 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2017-08-24 15:04:37 -0500 |
commit | 7db0bf8b31bf7839c7644cb2b640406fa2e61da0 (patch) | |
tree | c802b15bfe358c63f5b990ae1a6a131d69238deb /Android.mk | |
parent | 5d2205fafb5d244af658de5e3c38c6cc805ae345 (diff) |
Android: fix Android O version check for LLVM
With the release of O, the MESA_ANDROID_MAJOR_VERSION has changed to 8.
Change the LLVM check to match. There's no point to continue to support 'O'
as no one is going to use an old AOSP master.
Presumably, we'll be back here again to fix things again for P (or 9).
Reviewed-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 7087a44a9c..e03eb71612 100644 --- a/Android.mk +++ b/Android.mk @@ -95,7 +95,7 @@ define mesa-build-with-llvm $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0)) \ $(if $(filter 7,$(MESA_ANDROID_MAJOR_VERSION)), \ $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0)) \ - $(if $(filter O,$(MESA_ANDROID_MAJOR_VERSION)), \ + $(if $(filter 8,$(MESA_ANDROID_MAJOR_VERSION)), \ $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_PATCH=0)) \ $(eval LOCAL_SHARED_LIBRARIES += libLLVM) endef |