gn2bp: Merge cc_genrule cmd
Test: ./update_results.sh
Test: m cronet_aml_components_cronet_android_cronet
Test: m cronet_aml_java
Change-Id: Ib9efad99e87acf47ba88a31bac86dcabd2a40c4f
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index dc18f3b..58d7cad 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1174,6 +1174,13 @@
:param genrule_type: cc_genrule or java_genrule
:return: created module
'''
+ # TODO: Handle this target correctly, this target generates java_genrule but this target has
+ # different value for cpu-family arg between archs
+ if target.name == '//build/android:native_libraries_gen':
+ module = create_action_module_internal(target, genrule_type, target.arch['android_arm'])
+ blueprint.add_module(module)
+ return module
+
modules = {arch_name: create_action_module_internal(target, genrule_type, arch)
for arch_name, arch in target.arch.items()}
module = merge_modules(modules, genrule_type)