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 /src/amd | |
| 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 'src/amd')
| -rw-r--r-- | src/amd/Android.common.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 |