diff options
| author | Mauro Rossi <issor.oruam@gmail.com> | 2017-01-30 20:57:30 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-02-01 23:01:35 +0000 |
| commit | 9c45bb731c97d1f02f83b872c67b2c1b04ec3a41 (patch) | |
| tree | 51abd23d339eff3e3d6da6eb0cdc16ea64649154 /Android.common.mk | |
| parent | ccdd5b3738ef23dc69f322b9deab290cfaa1d0c5 (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>
Diffstat (limited to 'Android.common.mk')
| -rw-r--r-- | Android.common.mk | 14 |
1 files changed, 12 insertions, 2 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) |