X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2FAndroid.common.mk;h=62d4df15118a40ffd0a6f52938c1b5c26e017146;hb=26aee6f4d5a28350e1f6becfc485ce929c4126f9;hp=aa0b1742b6be498e25c2bc92dfd39162775a343a;hpb=4eec1cfa8ef250609699c8fc658e8fe58d6fab61;p=mesa.git

diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index aa0b1742b6b..62d4df15118 100644
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -55,10 +55,18 @@ LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/src/gallium/auxiliary \
 	$(intermediates)/common \
 	external/llvm/include \
-	external/llvm/device/include \
-	$(ELF_INCLUDES)
+	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)