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 <robh@kernel.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/Android.common.mk b/Android.common.mk
index 58f2bcfc7e01dce60c86d204b4d3238701656503..eb9a3f0e87094018c375248154e164b4cae9abc5 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -89,11 +89,9 @@ endif
 ifeq ($(MESA_ENABLE_LLVM),true)
   ifeq ($(MESA_ANDROID_MAJOR_VERSION),6)
     LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0
 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
   endif
   ifeq ($(MESA_ANDROID_MAJOR_VERSION),7)
     LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0

-    ELF_INCLUDES := external/elfutils/libelf

   endif
 endif
 
   endif
 endif
 

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 \
        $(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
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
        $(LOCAL_PATH)/common


@@ -65,5 +64,8 @@ LOCAL_STATIC_LIBRARIES := \
        libLLVMCore \
        libmesa_nir
 
        libLLVMCore \
        libmesa_nir
 

+LOCAL_WHOLE_STATIC_LIBRARIES := \
+       libelf
+

 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/src/gallium/Android.common.mk b/src/gallium/Android.common.mk
index ff4c30dabd6e645db9c0659a902fadaf9fb3326c..b2eb95bcd6465975c0e0178a7f1942e6c2a30677 100644 (file)
--- 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 \
 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)
 endif
 
 include $(MESA_COMMON_MK)

diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index e95e24a23177519e1c174ab9f0c4baae271cd85e..a605f1f5f019855232e00b46c3c683cd2b5de230 100644 (file)
--- 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))
 
 # sort GALLIUM_SHARED_LIBS to remove any duplicates
 LOCAL_SHARED_LIBRARIES += $(sort $(GALLIUM_SHARED_LIBS))
 

-LOCAL_STATIC_LIBRARIES :=
-

 ifeq ($(MESA_ENABLE_LLVM),true)
 ifeq ($(MESA_ENABLE_LLVM),true)

-LOCAL_STATIC_LIBRARIES += libelf

 LOCAL_LDLIBS += -lgcc
 endif
 
 LOCAL_LDLIBS += -lgcc
 endif