diff options
| -rw-r--r-- | Android.mk | 12 | ||||
| -rw-r--r-- | src/amd/Android.common.mk | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/Android.mk | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/Android.mk | 2 |
4 files changed, 7 insertions, 13 deletions
diff --git a/Android.mk b/Android.mk index 6571161c878..7087a44a9c3 100644 --- a/Android.mk +++ b/Android.mk @@ -92,16 +92,12 @@ define mesa-build-with-llvm $(if $(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5), \ $(warning Unsupported LLVM version in Android $(MESA_ANDROID_MAJOR_VERSION)),) \ $(if $(filter 6,$(MESA_ANDROID_MAJOR_VERSION)), \ - $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0) \ - $(eval LOCAL_STATIC_LIBRARIES += libLLVMCore) \ - $(eval LOCAL_C_INCLUDES += external/llvm/include external/llvm/device/include),) \ + $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0)) \ $(if $(filter 7,$(MESA_ANDROID_MAJOR_VERSION)), \ - $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0) \ - $(eval LOCAL_STATIC_LIBRARIES += libLLVMCore) \ - $(eval LOCAL_C_INCLUDES += external/llvm/include external/llvm/device/include),) \ + $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0)) \ $(if $(filter O,$(MESA_ANDROID_MAJOR_VERSION)), \ - $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_PATCH=0) \ - $(eval LOCAL_HEADER_LIBRARIES += llvm-headers),) + $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_PATCH=0)) \ + $(eval LOCAL_SHARED_LIBRARIES += libLLVM) endef # add subdirectories diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk index 7d08bfd31d7..4e2d0f9c2ff 100644 --- a/src/amd/Android.common.mk +++ b/src/amd/Android.common.mk @@ -55,9 +55,7 @@ LOCAL_C_INCLUDES := \ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \ $(MESA_TOP)/src/gallium/include \ $(MESA_TOP)/src/gallium/auxiliary \ - $(intermediates)/common \ - external/llvm/include \ - external/llvm/device/include + $(intermediates)/common LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(LOCAL_PATH)/common diff --git a/src/gallium/drivers/radeon/Android.mk b/src/gallium/drivers/radeon/Android.mk index eb1a32182bb..c2d3a1cbce6 100644 --- a/src/gallium/drivers/radeon/Android.mk +++ b/src/gallium/drivers/radeon/Android.mk @@ -30,7 +30,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) -LOCAL_SHARED_LIBRARIES := libdrm_radeon libLLVM +LOCAL_SHARED_LIBRARIES := libdrm_radeon LOCAL_MODULE := libmesa_pipe_radeon ifeq ($(MESA_ENABLE_LLVM),true) diff --git a/src/gallium/drivers/radeonsi/Android.mk b/src/gallium/drivers/radeonsi/Android.mk index 65661a5ea7a..e72b80c4e80 100644 --- a/src/gallium/drivers/radeonsi/Android.mk +++ b/src/gallium/drivers/radeonsi/Android.mk @@ -41,7 +41,7 @@ LOCAL_C_INCLUDES := \ LOCAL_STATIC_LIBRARIES := libmesa_amd_common -LOCAL_SHARED_LIBRARIES := libdrm_radeon libLLVM +LOCAL_SHARED_LIBRARIES := libdrm_radeon LOCAL_MODULE := libmesa_pipe_radeonsi intermediates := $(call local-generated-sources-dir) |