diff options
| author | Chih-Wei Huang <cwhuang@linux.org.tw> | 2016-08-23 14:36:29 +0800 |
|---|---|---|
| committer | Mauro Rossi <issor.oruam@gmail.com> | 2016-11-01 20:42:00 +0100 |
| commit | 7bdb0a5b2acc8cff3f67e8d8932ee5f00b7bf136 (patch) | |
| tree | af90637d26fd9b1490d374eb4eb04bea27ca5c7e | |
| parent | 762be8a98d86d4b618f88d758528d7da567a32f6 (diff) | |
| download | external_mesa3d-7bdb0a5b2acc8cff3f67e8d8932ee5f00b7bf136.zip external_mesa3d-7bdb0a5b2acc8cff3f67e8d8932ee5f00b7bf136.tar.gz external_mesa3d-7bdb0a5b2acc8cff3f67e8d8932ee5f00b7bf136.tar.bz2 | |
android: fix building errors on Android 7.0
| -rw-r--r-- | Android.common.mk | 2 | ||||
| -rw-r--r-- | src/gallium/Android.common.mk | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/Android.mk | 2 | ||||
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 8 |
4 files changed, 4 insertions, 10 deletions
diff --git a/Android.common.mk b/Android.common.mk index e9ad8ac..ebd76f8 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -93,7 +93,7 @@ LOCAL_CFLAGS_x86_64 += $(x86_64_flags) ifeq ($(MESA_ENABLE_LLVM),true) LOCAL_CFLAGS += \ - -DHAVE_LLVM=0x030$(if $(filter 5,$(MESA_ANDROID_MAJOR_VERSION)),5,7) -DMESA_LLVM_VERSION_PATCH=0 \ + -DHAVE_LLVM=0x030$(if $(filter 5,$(MESA_ANDROID_MAJOR_VERSION)),5,$(if $(filter 6,$(MESA_ANDROID_MAJOR_VERSION)),7,8)) -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 757716f..b40b8c6 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 5,$(MESA_ANDROID_MAJOR_VERSION)),0.153/,src/)libelf + external/elfutils/$(if $(filter 5,$(MESA_ANDROID_MAJOR_VERSION)),0.153/,$(if $(filter 6,$(MESA_ANDROID_MAJOR_VERSION)),src/))libelf endif include $(MESA_COMMON_MK) diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk index f5b5a0c..b279c3b 100644 --- a/src/gallium/auxiliary/Android.mk +++ b/src/gallium/auxiliary/Android.mk @@ -46,7 +46,7 @@ endif # We need libmesa_nir to get NIR's generated include directories. LOCAL_MODULE := libmesa_gallium -LOCAL_STATIC_LIBRARIES += libmesa_nir +LOCAL_STATIC_LIBRARIES := libmesa_nir libLLVMCore # generate sources LOCAL_MODULE_CLASS := STATIC_LIBRARIES diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 13505c8..18aefe3 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -123,15 +123,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libmesa_util \ libmesa_loader \ -LOCAL_STATIC_LIBRARIES := ifeq ($(MESA_ENABLE_LLVM),true) -LOCAL_STATIC_LIBRARIES += \ - libLLVMR600CodeGen \ - libLLVMR600Desc \ - libLLVMR600Info \ - libLLVMR600AsmPrinter \ - libelf +LOCAL_STATIC_LIBRARIES := libelf libz LOCAL_LDLIBS += $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-lgcc) endif |