diff options
| author | Mauro Rossi <[email protected]> | 2017-01-30 20:57:30 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-02-03 11:08:59 +0000 |
| commit | 77ec080710aa7f38c02f0d4a62f0a8780cfcc61e (patch) | |
| tree | 4c2302b778fb44b87633ba71d4418e6848ee63ef /Android.common.mk | |
| parent | eadbc95d642cac6feb7f5e5abe136dfd36ff76ac (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" <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
(cherry picked from commit 9c45bb731c97d1f02f83b872c67b2c1b04ec3a41)
[Emil Velikov: resolve trivial conflicts]
Signed-off-by: Emil Velikov <[email protected]>
Conflicts:
Android.common.mk
Diffstat (limited to 'Android.common.mk')
| -rw-r--r-- | Android.common.mk | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Android.common.mk b/Android.common.mk index a75d4e721df..f53750c5fc3 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -78,10 +78,22 @@ endif ifeq ($(MESA_ENABLE_LLVM),true) LOCAL_CFLAGS += \ - -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2 \ -D__STDC_CONSTANT_MACROS \ -D__STDC_FORMAT_MACROS \ -D__STDC_LIMIT_MACROS + + 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) |