android: ac/common: always build NIR translation

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

diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index 8be38dd3f4143d3c3050b53a1c246fd1fb6fd138..7d08bfd31d79baa462c2ef91164f35d1d7e58ec3 100644 (file)
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -29,8 +29,10 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_amd_common
 
 LOCAL_SRC_FILES := \
+       $(AMD_COMMON_FILES) \
        $(AMD_COMPILER_FILES) \
-       $(AMD_DEBUG_FILES)
+       $(AMD_DEBUG_FILES) \
+       $(AMD_NIR_FILES)
 
 LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU   # instructs LLVM to declare LLVMInitializeAMDGPU* functions
 
@@ -55,11 +57,21 @@ LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/gallium/auxiliary \
        $(intermediates)/common \
        external/llvm/include \
-       external/llvm/device/include \
-       external/libcxx/include \
-       $(ELF_INCLUDES)
+       external/llvm/device/include
 
-LOCAL_STATIC_LIBRARIES := libLLVMCore
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+       $(LOCAL_PATH)/common
+
+LOCAL_SHARED_LIBRARIES := \
+       libdrm_amdgpu
+
+LOCAL_STATIC_LIBRARIES := \
+       libmesa_nir
+
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+       libelf
+
+$(call mesa-build-with-llvm)
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)