summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChih-Wei Huang <[email protected]>2019-06-20 15:46:22 +0800
committerMauro Rossi <[email protected]>2019-07-10 08:56:04 +0200
commite2ef281da14c2c735b3b82a7a405e9463aa74b67 (patch)
tree079fc33fd1fdc56b66fb7118b809f3e8738d3875 /src
parent8ff01f0342d3eb559661779283e4d6f133af5cbd (diff)
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 <[email protected]> Acked-by: Eric Engestrom <[email protected]> Acked-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/amd/vulkan/Android.mk5
1 files 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