Android: rework LLVM build support

[mesa.git] / src / amd / Android.common.mk

diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index dfa7e59e9a2cfe1ccb646cc39cbbadf77e010a18..62d4df15118a40ffd0a6f52938c1b5c26e017146 100644 (file)
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -49,15 +49,24 @@ LOCAL_C_INCLUDES := \
        $(MESA_TOP)/include \
        $(MESA_TOP)/src \
        $(MESA_TOP)/src/amd/common \
+       $(MESA_TOP)/src/compiler \
+       $(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 \
-       external/libcxx/include \
-       external/elfutils/$(if $(filter 5,$(MESA_ANDROID_MAJOR_VERSION)),0.153/,$(if $(filter 6,$(MESA_ANDROID_MAJOR_VERSION)),src/))libelf
+       external/llvm/device/include
 
-LOCAL_STATIC_LIBRARIES := libLLVMCore
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+       $(LOCAL_PATH)/common
+
+LOCAL_STATIC_LIBRARIES := \
+       libmesa_nir
+
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+       libelf
+
+$(call mesa-build-with-llvm)
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)