Module: Mesa Branch: staging/21.0 Commit: d2005c8943a03124f33322877bc52c50c47442cc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d2005c8943a03124f33322877bc52c50c47442cc
Author: Mauro Rossi <[email protected]> Date: Sun Mar 21 20:48:22 2021 +0100 android: anv: add libcutils shared dependency My previous patch merged as 2b1930a50a0b was incomplete Fixes the following building error: FAILED: out/target/product/x86_64/obj/SHARED_LIBRARIES/vulkan.anv_intermediates/LINKED/vulkan.anv.so ... ld.lld: error: undefined symbol: property_get >>> referenced by os_misc.c:193 (external/mesa/src/util/os_misc.c:193) >>> os_misc.o:(os_get_option) in archive >>> out/target/product/x86_64/obj/STATIC_LIBRARIES/libmesa_util_intermediates/libmesa_util.a Cc: 21.0 <[email protected]> Fixes: eeecc21d935c ("util: Add property_get() fallback for android") Fixes: 2b1930a50a0b ("android: radv: add libcutils shared dependency") Reviewed-by: Lionel Landwerlin <[email protected]> Acked-by: Jason Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9744> (cherry picked from commit cb4287608a93c3ea62acb7911de84b5360c3b2cb) --- .pick_status.json | 2 +- src/intel/Android.vulkan.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 6a05ce2a548..7ead243fbe0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -292,7 +292,7 @@ "description": "android: anv: add libcutils shared dependency", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "eeecc21d935c6c8fc783d9f805b5fa153b455df5" }, diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk index 10e72c1e581..8b95447604a 100644 --- a/src/intel/Android.vulkan.mk +++ b/src/intel/Android.vulkan.mk @@ -317,7 +317,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libmesa_anv_gen125 \ libmesa_intel_compiler -LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) libz libsync liblog +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) libz libsync liblog libcutils LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES) # If Android version >=8 MESA should static link libexpat else should dynamic link _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
