From cc16113202769a0016d3f82351e441dd03261757 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Fri, 30 Oct 2020 01:24:08 +0100 Subject: [PATCH] android: fix libsync dependencies (v2) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (v2) Remove include from Android.common.mk Avoid adding libsync shared dependency in Android.common.mk Add libsync shared dependency where needed, for easier tracking (v1) Fixes the following building errors: In file included from external/mesa/src/gallium/drivers/freedreno/a3xx/fd3_query.c:27: In file included from external/mesa/src/gallium/drivers/freedreno/freedreno_query_hw.h:33: In file included from external/mesa/src/gallium/drivers/freedreno/freedreno_context.h:33: external/mesa/src/util/libsync.h:48:10: fatal error: 'android/sync.h' file not found ^~~~~~~~~~~~~~~~ 1 error generated. In file included from external/mesa/src/mesa/drivers/dri/i965/brw_sync.c:41: external/mesa/src/util/libsync.h:48:10: fatal error: 'android/sync.h' file not found ^~~~~~~~~~~~~~~~ 1 error generated. In file included from external/mesa/src/gallium/auxiliary/util/u_tests.c:513: external/mesa/src/util/libsync.h:48:10: fatal error: 'android/sync.h' file not found ^~~~~~~~~~~~~~~~ 1 error generated. FAILED: out/target/product/x86_64/obj_x86/SHARED_LIBRARIES/i965_dri_intermediates/LINKED/i965_dri.so ... external/mesa/src/mesa/drivers/dri/i965/brw_sync.c:223: error: undefined reference to 'sync_wait' external/mesa/src/mesa/drivers/dri/i965/brw_sync.c:287: error: undefined reference to 'sync_wait' FAILED: out/target/product/x86_64/obj_x86/SHARED_LIBRARIES/gallium_dri_intermediates/LINKED/gallium_dri.so ... external/mesa/src/util/libsync.h:142: error: undefined reference to 'sync_merge' external/mesa/src/gallium/drivers/freedreno/freedreno_fence.c:94: error: undefined reference to 'sync_wait' external/mesa/src/gallium/auxiliary/util/u_tests.c:575: error: undefined reference to 'sync_wait' Fixes: 27b888794624 ("android: Add pre-4.7 Android kernel compatibility to our libsync header.") Signed-off-by: Mauro Rossi Acked-by: Rob Clark Acked-by: Eric Anholt Acked-by: Tapani Pälli Part-of: --- src/gallium/auxiliary/Android.mk | 1 + src/gallium/drivers/freedreno/Android.mk | 2 +- src/gallium/targets/dri/Android.mk | 3 ++- src/mesa/drivers/dri/Android.mk | 1 + src/util/Android.mk | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk index 2c3f813ac6e..664742ff48d 100644 --- a/src/gallium/auxiliary/Android.mk +++ b/src/gallium/auxiliary/Android.mk @@ -53,6 +53,7 @@ LOCAL_CPPFLAGS += -std=c++14 # We need libmesa_nir to get NIR's generated include directories. LOCAL_MODULE := libmesa_gallium +LOCAL_SHARED_LIBRARIES += libsync LOCAL_STATIC_LIBRARIES += libmesa_nir LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures diff --git a/src/gallium/drivers/freedreno/Android.mk b/src/gallium/drivers/freedreno/Android.mk index ee4d06af612..2b27556e3d0 100644 --- a/src/gallium/drivers/freedreno/Android.mk +++ b/src/gallium/drivers/freedreno/Android.mk @@ -44,7 +44,7 @@ LOCAL_C_INCLUDES := \ LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H) -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := libdrm libsync LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_nir libfreedreno_drm libfreedreno_ir3 libfreedreno_perfcntrs libfreedreno_registers LOCAL_MODULE := libmesa_pipe_freedreno diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 1d8df33c940..c2bf3f14cae 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -43,7 +43,8 @@ LOCAL_SHARED_LIBRARIES := \ libdl \ libglapi \ libz \ - liblog + liblog \ + libsync # If Android version >=8 MESA should static link libexpat else should dynamic link ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0) diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk index 60c8476a38a..fb7d97f1acf 100644 --- a/src/mesa/drivers/dri/Android.mk +++ b/src/mesa/drivers/dri/Android.mk @@ -51,6 +51,7 @@ MESA_DRI_SHARED_LIBRARIES := \ libdl \ libglapi \ liblog \ + libsync \ libz # If Android version >=8 MESA should static link libexpat else should dynamic link diff --git a/src/util/Android.mk b/src/util/Android.mk index 6972ae58f7b..52f2be32d03 100644 --- a/src/util/Android.mk +++ b/src/util/Android.mk @@ -58,7 +58,7 @@ LOCAL_SHARED_LIBRARIES := \ libexpat endif -LOCAL_SHARED_LIBRARIES += liblog +LOCAL_SHARED_LIBRARIES += liblog libsync # Generated sources