diff options
| author | Tapani Pälli <[email protected]> | 2019-02-26 10:27:15 +0200 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2019-02-27 08:56:46 +0200 |
| commit | 5e52184f722b70c024bec6dc0872cbf6553a1d82 (patch) | |
| tree | 889f84d02eec372116715aa5947d971f19757611 | |
| parent | a3c366c4b22993731b5d39a8387f30a09de10e38 (diff) | |
android: make libbacktrace optional on USE_LIBBACKTRACE
Otherwise with VNDK enabled we fail linking:
src/gallium/targets/dri/Android.mk: error: gallium_dri (native:vendor)
should not link to libbacktrace.vendor (native:vndk_private)
Option makes it possible to use libbacktrace only when VNDK is not
enabled.
Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/Android.mk | 7 | ||||
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk index 7618c6fcd93..fe976501451 100644 --- a/src/gallium/auxiliary/Android.mk +++ b/src/gallium/auxiliary/Android.mk @@ -32,8 +32,11 @@ LOCAL_SRC_FILES := \ $(C_SOURCES) \ $(NIR_SOURCES) \ $(RENDERONLY_SOURCES) \ - $(VL_STUB_SOURCES) \ - util/u_debug_stack_android.cpp + $(VL_STUB_SOURCES) + +ifeq ($(USE_LIBBACKTRACE),true) + LOCAL_SRC_FILES += util/u_debug_stack_android.cpp +endif LOCAL_C_INCLUDES := \ $(GALLIUM_TOP)/auxiliary/util \ diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 9c43fa1e8fd..7638a67b26f 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -40,12 +40,15 @@ LOCAL_LDFLAGS := \ -Wl,--undefined-version LOCAL_SHARED_LIBRARIES := \ - libbacktrace \ libdl \ libglapi \ libexpat \ libz +ifeq ($(USE_LIBBACKTRACE),true) + LOCAL_SHARED_LIBRARIES += libbacktrace +endif + $(foreach d, $(MESA_BUILD_GALLIUM), $(eval LOCAL_CFLAGS += $(patsubst HAVE_%,-D%,$(d)))) # sort GALLIUM_LIBS to remove any duplicates |