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 38eb90991ab2..593f636a31ed 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 f04d010592e0..764076e599e1 100644
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -54,15 +54,15 @@ LOCAL_C_INCLUDES := \
$(intermediates)/common \
external/llvm/include \
external/llvm/device/include \
- external/libcxx/include \
- $(ELF_INCLUDES)
+ external/libcxx/include
LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(LOCAL_PATH)/common
LOCAL_STATIC_LIBRARIES := \
libLLVMCore \
- libmesa_nir
+ libmesa_nir \
+ libelf
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
diff --git a/src/gallium/Android.common.mk b/src/gallium/Android.common.mk
index 8559b5bce794..0391426b89b4 100644
--- a/src/gallium/Android.common.mk
+++ b/src/gallium/Android.common.mk
@@ -33,8 +33,7 @@ ifeq ($(MESA_ENABLE_LLVM),true)
LOCAL_C_INCLUDES += \
external/llvm/include \
external/llvm/device/include \
- external/libcxx/include \
- $(ELF_INCLUDES)
+ external/libcxx/include
endif
include $(MESA_COMMON_MK)
diff --git a/src/gallium/targets/dri/Android.mk
b/src/gallium/targets/dri/Android.mk
index f5f0124882fd..9dbac8f79637 100644
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -105,10 +105,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libmesa_util \
libmesa_loader
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := libelf
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
