Commit 3cd9386a authored by maurossi's avatar maurossi

android: fix libsync dependencies

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.

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/util/libsync.h:142: error: undefined reference to 'sync_merge'
external/mesa/src/util/libsync.h:142: error: undefined reference to 'sync_merge'
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'
external/mesa/src/gallium/auxiliary/util/u_tests.c:578: error: undefined reference to 'sync_wait'
external/mesa/src/gallium/auxiliary/util/u_tests.c:579: error: undefined reference to 'sync_wait'

Fixes: 27b88879 ("android: Add pre-4.7 Android kernel compatibility to our libsync header.")
Signed-off-by: maurossi's avatarMauro Rossi <issor.oruam@gmail.com>
parent 303a74c5
Pipeline #218053 waiting for manual action with stages
in 22 seconds
......@@ -27,7 +27,8 @@ endif
LOCAL_C_INCLUDES += \
$(MESA_TOP)/src \
$(MESA_TOP)/include
$(MESA_TOP)/include \
system/core/libsync/include
MESA_VERSION := $(shell cat $(MESA_TOP)/VERSION)
LOCAL_CFLAGS += \
......
......@@ -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)
......
......@@ -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
......
......@@ -58,7 +58,7 @@ LOCAL_SHARED_LIBRARIES := \
libexpat
endif
LOCAL_SHARED_LIBRARIES += liblog
LOCAL_SHARED_LIBRARIES += liblog libsync
# Generated sources
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment