From e2ff12e919b5f887083225d96f4060a122c12eab Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 3 May 2017 14:35:23 -0500 Subject: Android: rework libelf dependencies Add libelf as a library dependency rather than explicitly listing its include paths. This should work for Android M and later which have the necessary exported directories in libelf. Signed-off-by: Rob Herring Reviewed-by: Emil Velikov --- src/amd/Android.common.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/amd') diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk index a6c0deb2d72..18ace02b90c 100644 --- 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) -- cgit v1.2.3