gn2bp: Fix arch-dependent cc_genrule
* The cmd of the `cc_genrule` is now arch-dependent. So we no longer generate a genrule for each arch.
The propagation of the arch-dependent genrule was broken due to an old if-statement.
Test: m
Change-Id: I4b9b522c429f32fe74d141b00bd856f6c39498d7
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index eb9064b..d33dc32 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1517,14 +1517,13 @@
if dep_module.type == 'cc_library_static':
module.target[arch_name].static_libs.add(dep_module.name)
elif dep_module.type == 'cc_genrule':
- if dep_module.name.endswith(arch_name):
- module.target[arch_name].generated_headers.update(dep_module.genrule_headers)
- module.target[arch_name].srcs.update(dep_module.genrule_srcs)
- module.target[arch_name].shared_libs.update(dep_module.genrule_shared_libs)
- module.target[arch_name].header_libs.update(dep_module.genrule_header_libs)
- if module.type not in ["cc_object"]:
- module.target[arch_name].export_generated_headers.update(
- dep_module.genrule_headers)
+ module.target[arch_name].generated_headers.update(dep_module.genrule_headers)
+ module.target[arch_name].srcs.update(dep_module.genrule_srcs)
+ module.target[arch_name].shared_libs.update(dep_module.genrule_shared_libs)
+ module.target[arch_name].header_libs.update(dep_module.genrule_header_libs)
+ if module.type not in ["cc_object"]:
+ module.target[arch_name].export_generated_headers.update(
+ dep_module.genrule_headers)
elif dep_module.type == 'cc_object':
if dep_module.has_input_files():
# Only add it as part of srcs if the dep_module has input files otherwise