Android: rework libelf dependencies

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

diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index a6c0deb2d726ede2c7217add9ae5bb442fcab778..18ace02b90c19fdc829b04d26d98bde4a5f92798 100644 (file)
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -55,8 +55,7 @@ LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/gallium/auxiliary \
        $(intermediates)/common \
        external/llvm/include \
-       external/llvm/device/include \
-       $(ELF_INCLUDES)
+       external/llvm/device/include
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
        $(LOCAL_PATH)/common
@@ -65,5 +64,8 @@ LOCAL_STATIC_LIBRARIES := \
        libLLVMCore \
        libmesa_nir
 
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+       libelf
+
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)