diff options
| author | Rob Herring <[email protected]> | 2017-05-03 14:35:23 -0500 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-05-11 13:52:21 +0100 |
| commit | e2ff12e919b5f887083225d96f4060a122c12eab (patch) | |
| tree | f8abfc2f40540f887326c817b3ef0a682a8446c5 /src/gallium | |
| parent | 06260da16e74f69273a857099b8537b3c957de44 (diff) | |
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 <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/Android.common.mk | 3 | ||||
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 3 |
2 files changed, 1 insertions, 5 deletions
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 |