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). Signed-off-by: Rob Herring <r...@kernel.org> --- Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index 1fcde5f4d7fb..1fb584dd5eb0 100644 --- a/Android.mk +++ b/Android.mk @@ -96,7 +96,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 -- 2.11.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev