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/amd/Android.common.mk | |
| 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/amd/Android.common.mk')
| -rw-r--r-- | src/amd/Android.common.mk | 6 |
1 files changed, 4 insertions, 2 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) |