gn2bp: using dep.name when adding dependency is more correct
This is pretty much a noop, but if we ever decided to change the
target.name or similar, the code would still work.
Test: //components/cronet/android:cronet
Change-Id: I37ad0250ec1b25f03f8942e34fddc57186340276
diff --git a/tools/gn2bp/gn_utils.py b/tools/gn2bp/gn_utils.py
index 6f3c787..494ed25 100644
--- a/tools/gn2bp/gn_utils.py
+++ b/tools/gn2bp/gn_utils.py
@@ -326,24 +326,23 @@
# Recurse in dependencies.
for gn_dep_name in desc.get('deps', []):
dep = self.parse_gn_desc(gn_desc, gn_dep_name)
- dep_name = label_without_toolchain(gn_dep_name)
if dep.is_third_party_dep_:
- target.deps.add(dep_name)
+ target.deps.add(dep.name)
elif dep.type == 'proto_library':
- target.proto_deps.add(dep_name)
- target.transitive_proto_deps.add(dep_name)
+ target.proto_deps.add(dep.name)
+ target.transitive_proto_deps.add(dep.name)
target.proto_paths.update(dep.proto_paths)
target.transitive_proto_deps.update(dep.transitive_proto_deps)
elif dep.type == 'source_set':
- target.source_set_deps.add(dep_name)
+ target.source_set_deps.add(dep.name)
target.update(dep) # Bubble up source set's cflags/ldflags etc.
elif dep.type == 'group':
target.update(dep) # Bubble up groups's cflags/ldflags etc.
elif dep.type in ['action', 'action_foreach', 'copy']:
if proto_target_type is None:
- target.deps.add(dep_name)
+ target.deps.add(dep.name)
elif dep.type in LINKER_UNIT_TYPES:
- target.deps.add(dep_name)
+ target.deps.add(dep.name)
elif dep.type == 'java_group':
# Explicitly break dependency chain when a java_group is added.
# Java sources are collected and eventually compiled as one large
@@ -353,7 +352,7 @@
if dep.type == 'static_library':
# Bubble up static_libs. Necessary, since soong does not propagate
# static_libs up the build tree.
- target.transitive_static_libs_deps.add(dep_name)
+ target.transitive_static_libs_deps.add(dep.name)
target.transitive_static_libs_deps.update(dep.transitive_static_libs_deps)
target.deps.update(target.transitive_static_libs_deps)