summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/amd/Android.common.mk6
-rw-r--r--src/gallium/Android.common.mk3
-rw-r--r--src/gallium/targets/dri/Android.mk3
3 files changed, 5 insertions, 7 deletions
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)
diff --git a/src/gallium/Android.common.mk b/src/gallium/Android.common.mk
index ff4c30dabd6..b2eb95bcd64 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 e95e24a2317..a605f1f5f01 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