[vulkan] generated encoder (guest)
bug: 111137294
bug: 118433589
+ Remove duplicate encoding logic in goldfish_vk_marshaling
Change-Id: I9fd3a060276bd4f3e7f18acdcfe7371075c27a5f
diff --git a/cmake_transform.py b/cmake_transform.py
index a7c6a04..834dd4b 100644
--- a/cmake_transform.py
+++ b/cmake_transform.py
@@ -94,14 +94,22 @@
# Make sure we remove the lib prefix from all our dependencies.
libs = [remove_lib_prefix(l) for l in module['libs']]
+ staticlibs = [remove_lib_prefix(l) for l in
+ module.get('staticlibs', [])
+ if l != "libandroidemu"]
# Configure the target.
make.append('target_compile_definitions(%s PRIVATE %s)' %
(name, ' '.join(defs)))
make.append('target_compile_options(%s PRIVATE %s)' %
(name, ' '.join(flags)))
- make.append('target_link_libraries(%s PRIVATE %s)' %
- (name, ' '.join(libs)))
+
+ if len(staticlibs) > 0:
+ make.append('target_link_libraries(%s PRIVATE %s PRIVATE %s)' %
+ (name, ' '.join(libs), " ".join(staticlibs)))
+ else:
+ make.append('target_link_libraries(%s PRIVATE %s)' %
+ (name, ' '.join(libs)))
return make