joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "gn2bp: Fix arch-dependent cc_genrule" am: 3015f6bcac am: 5e7254853c

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2389540

Change-Id: I49b88d0e91a9a35ac6ed26a189845ae55c9a52a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mohannad Farrag 2023-02-22 19:35:27 +00:00 • committed by Automerger Merge Worker
commit 5f259a3e2f
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tools/gn2bp/gen_android_bp
View file

@ -1519,14 +1519,13 @@ def create_modules_from_target(blueprint, gn, gn_target_name):
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