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 <r...@kernel.org>
---
Android.common.mk | 2 --
src/amd/Android.common.mk | 6 ++++--
src/gallium/Android.common.mk | 3 +--
src/gallium/targets/dri/Android.mk | 3 ---
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/Android.common.mk b/Android.common.mk
index 2cd4c1eef4bb..a7b78bb910fc 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -86,11 +86,9 @@ endif
ifeq ($(MESA_ENABLE_LLVM),true)
ifeq ($(MESA_ANDROID_MAJOR_VERSION),6)
LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0
- ELF_INCLUDES := external/elfutils/src/libelf
endif
ifeq ($(MESA_ANDROID_MAJOR_VERSION),7)
LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0
- ELF_INCLUDES := external/elfutils/libelf
endif
endif
diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index a6c0deb2d726..18ace02b90c1 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)
diff --git a/src/gallium/Android.common.mk b/src/gallium/Android.common.mk
index ff4c30dabd6e..b2eb95bcd646 100644
--- a/src/gallium/Android.common.mk
+++ b/src/gallium/Android.common.mk
@@ -32,8 +32,7 @@ LOCAL_C_INCLUDES += \
ifeq ($(MESA_ENABLE_LLVM),true)
LOCAL_C_INCLUDES += \
external/llvm/include \
- external/llvm/device/include \
- $(ELF_INCLUDES)
+ external/llvm/device/include
endif
include $(MESA_COMMON_MK)
diff --git a/src/gallium/targets/dri/Android.mk
b/src/gallium/targets/dri/Android.mk
index e95e24a23177..a605f1f5f019 100644
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -57,10 +57,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
# sort GALLIUM_SHARED_LIBS to remove any duplicates
LOCAL_SHARED_LIBRARIES += $(sort $(GALLIUM_SHARED_LIBS))
-LOCAL_STATIC_LIBRARIES :=
-
ifeq ($(MESA_ENABLE_LLVM),true)
-LOCAL_STATIC_LIBRARIES += libelf
LOCAL_LDLIBS += -lgcc
endif
--
2.11.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
