diff options
| author | Mauro Rossi <issor.oruam@gmail.com> | 2020-10-22 02:03:17 +0200 |
|---|---|---|
| committer | Tapani Pälli <tapani.palli@intel.com> | 2020-10-29 08:31:46 +0200 |
| commit | 9f1a04911030640f78df6862df585a4a85b43cfc (patch) | |
| tree | ee76c8a94f812a8fa79b3a879fdb3c788c29e536 | |
| parent | 7dc17ae5abc4ef85012560e8146def6bdb2599a7 (diff) | |
android: fix libsync dependenciesmauro_sync_fix
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: 27b888794624 ("android: Add pre-4.7 Android kernel compatibility to our libsync header.")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
| -rw-r--r-- | Android.common.mk | 3 | ||||
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/Android.mk | 1 | ||||
| -rw-r--r-- | src/util/Android.mk | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/Android.common.mk b/Android.common.mk index 9141ef951d6..361b389645e 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -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 += \ 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 |