From e2ef281da14c2c735b3b82a7a405e9463aa74b67 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Thu, 20 Jun 2019 15:46:22 +0800 Subject: [PATCH] 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 --- src/amd/vulkan/Android.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 -- 2.30.2