diff options
-rw-r--r-- | Android.common.mk | 2 | ||||
-rw-r--r-- | src/gallium/Android.common.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Android.common.mk b/Android.common.mk index 8a752a5..98be839 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -76,7 +76,7 @@ endif ifeq ($(MESA_ENABLE_LLVM),true) LOCAL_CFLAGS += \ - -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2 \ + -DHAVE_LLVM=0x030$(if $(filter 5,$(MESA_ANDROID_MAJOR_VERSION)),5,7) -DMESA_LLVM_VERSION_PATCH=0 \ -D__STDC_CONSTANT_MACROS \ -D__STDC_FORMAT_MACROS \ -D__STDC_LIMIT_MACROS diff --git a/src/gallium/Android.common.mk b/src/gallium/Android.common.mk index 7c6c7ac..757716f 100644 --- a/src/gallium/Android.common.mk +++ b/src/gallium/Android.common.mk @@ -34,7 +34,7 @@ LOCAL_C_INCLUDES += \ external/llvm/include \ external/llvm/device/include \ external/libcxx/include \ - external/elfutils/$(if $(filter true,$(MESA_LOLLIPOP_BUILD)),0.153/)libelf + external/elfutils/$(if $(filter 5,$(MESA_ANDROID_MAJOR_VERSION)),0.153/,src/)libelf endif include $(MESA_COMMON_MK) |