From: Chih-Wei Huang Date: Thu, 20 Jun 2019 07:46:22 +0000 (+0800) Subject: android: radv: fix improper use of LOCAL_WHOLE_STATIC_LIBRARIES X-Git-Tag: android-x86-9.0-r1~4560 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e2ef281da14c2c735b3b82a7a405e9463aa74b67;p=android-x86%2Fexternal-mesa.git android: radv: fix improper use of LOCAL_WHOLE_STATIC_LIBRARIES The libmesa_git_sha1 is a dummy library. There is no reason to put it into LOCAL_WHOLE_STATIC_LIBRARIES. Move libmesa_vulkan_util to the vulkan.radv which really needs it. Signed-off-by: Chih-Wei Huang Acked-by: Eric Engestrom Acked-by: Emil Velikov --- diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk index a7c31d494f1..4290cc02b67 100644 --- a/src/amd/vulkan/Android.mk +++ b/src/amd/vulkan/Android.mk @@ -74,7 +74,7 @@ LOCAL_C_INCLUDES := \ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util \ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_util,,) -LOCAL_WHOLE_STATIC_LIBRARIES := \ +LOCAL_STATIC_LIBRARIES := \ libmesa_vulkan_util \ libmesa_git_sha1 @@ -158,7 +158,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libmesa_compiler \ libmesa_amdgpu_addrlib \ libmesa_amd_common \ - libmesa_radv_common + libmesa_radv_common \ + libmesa_vulkan_util LOCAL_SHARED_LIBRARIES += $(RADV_SHARED_LIBRARIES) libz libsync liblog