[Mesa-dev] [PATCH 4/8] android: radv: fix improper use of LOCAL_WHOLE_STATIC_LIBRARIES

Chih-Wei Huang cwhuang at android-x86.org
Tue Jun 25 10:08:30 UTC 2019


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 <cwhuang at linux.org.tw>
---
 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 a7c31d4..4290cc0 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.7.4



More information about the mesa-dev mailing list