summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Rossi <issor.oruam@gmail.com>2017-01-30 20:57:30 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2017-02-01 23:01:35 +0000
commit9c45bb731c97d1f02f83b872c67b2c1b04ec3a41 (patch)
tree51abd23d339eff3e3d6da6eb0cdc16ea64649154
parentccdd5b3738ef23dc69f322b9deab290cfaa1d0c5 (diff)
android: fix llvm, elf dependencies for M, N releases
These changes set the correct llvm version and elf include path which differ for Marshmallow and Nougat Cc: "17.0" <mesa-stable@lists.freedesktop.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
-rw-r--r--Android.common.mk14
-rw-r--r--src/amd/Android.common.mk2
-rw-r--r--src/gallium/Android.common.mk2
3 files changed, 14 insertions, 4 deletions
diff --git a/Android.common.mk b/Android.common.mk
index 4fa02ae0521..b03876d6269 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -81,8 +81,18 @@ endif
endif
ifeq ($(MESA_ENABLE_LLVM),true)
-LOCAL_CFLAGS += \
- -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2
+ ifeq ($(MESA_ANDROID_MAJOR_VERSION),5)
+ LOCAL_CFLAGS += -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2
+ ELF_INCLUDES := external/elfutils/0.153/libelf
+ endif
+ ifeq ($(MESA_ANDROID_MAJOR_VERSION),6)
+ LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0
+ ELF_INCLUDES := external/elfutils/src/libelf
+ endif
+ ifeq ($(MESA_ANDROID_MAJOR_VERSION),7)
+ LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0
+ ELF_INCLUDES := external/elfutils/libelf
+ endif
endif
ifneq ($(LOCAL_IS_HOST_MODULE),true)
diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index dfa7e59e9a2..faace71e952 100644
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -55,7 +55,7 @@ LOCAL_C_INCLUDES := \
external/llvm/include \
external/llvm/device/include \
external/libcxx/include \
- external/elfutils/$(if $(filter 5,$(MESA_ANDROID_MAJOR_VERSION)),0.153/,$(if $(filter 6,$(MESA_ANDROID_MAJOR_VERSION)),src/))libelf
+ $(ELF_INCLUDES)
LOCAL_STATIC_LIBRARIES := libLLVMCore
diff --git a/src/gallium/Android.common.mk b/src/gallium/Android.common.mk
index 7c6c7ac6820..8559b5bce79 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
+ $(ELF_INCLUDES)
endif
include $(MESA_COMMON_MK)