summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorPatrick Rohr <prohr@google.com>2023-05-10 09:45:59 -0700
committerPatrick Rohr <prohr@google.com>2023-05-12 15:50:39 -0700
commit832220f68ce42e09ded152d8c682c6986bd37bea (patch)
tree035bac091db4347f6c9c6bb4a2c234930acbec56 /android
parent2b9676f968141fde1a22b0bba26acd33855bb98a (diff)
downloadcronet-832220f68ce42e09ded152d8c682c6986bd37bea.tar.gz
gn2bp: Concatenate if statements
Test: update_results.sh Change-Id: I4ab8f83abb8dd964a1573db37e31ed420afe2a0b
Diffstat (limited to 'android')
-rwxr-xr-xandroid/tools/gn2bp/gen_android_bp7
1 files changed, 2 insertions, 5 deletions
diff --git a/android/tools/gn2bp/gen_android_bp b/android/tools/gn2bp/gen_android_bp
index 02d75ec56..30ed9cee0 100755
--- a/android/tools/gn2bp/gen_android_bp
+++ b/android/tools/gn2bp/gen_android_bp
@@ -1467,11 +1467,8 @@ def create_modules_from_target(blueprint, gn, gn_target_name, is_test_target):
if dep_module.type == 'cc_library_shared':
module_target.shared_libs.add(dep_module.name)
elif dep_module.type == 'cc_library_static':
- if module.type in ['cc_library_shared', 'cc_binary']:
- if dep_module.gn_type == 'source_set':
- module_target.whole_static_libs.add(dep_module.name)
- else:
- module_target.static_libs.add(dep_module.name)
+ if module.type in ['cc_library_shared', 'cc_binary'] and dep_module.gn_type == 'source_set':
+ module_target.whole_static_libs.add(dep_module.name)
else:
module_target.static_libs.add(dep_module.name)
elif dep_module.type == 'cc_genrule':