LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gn2bp: collect linker unit deps per target

Browse Source 
Both transitive static libraries and LINKER_UNIT_TYPES dependencies need
to be stored separately for every target as they could differ. In
reality, only static deps differ right now.

I am not a big fan of how transitive_static_libs_deps are handled in
this CL; maybe we can come up with a more readable solution.

Test: //components/cronet/android:cronet
Change-Id: Ia4ad8e264b1243b7dd5d58a26543ee78206f9c79
This commit is contained in:
Patrick Rohr
2022-11-16 23:40:40 -08:00
parent f1004372e6
commit 297f979e8f
2 changed files with 11 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/gn2bp/gn_utils.py
View File

@@ -100,6 +100,8 @@ class GnParser(object):
self.cflags = set()
self.defines = set()
self.include_dirs = set()
self.deps = set()
self.transitive_static_libs_deps = set()
def __init__(self, name, type):
@@ -142,7 +144,6 @@ class GnParser(object):
self.source_set_deps = set() # Transitive set of source_set deps.
self.proto_deps = set()
self.transitive_proto_deps = set()
self.transitive_static_libs_deps = set()
# TODO: come up with a better way to only run this once.
# is_finalized tracks whether finalize() was called on this target.
@@ -194,6 +195,7 @@ class GnParser(object):
self.cflags = set.intersection(*[arch.cflags for arch in self.arch.values()])
self.defines = set.intersection(*[arch.defines for arch in self.arch.values()])
self.include_dirs = set.intersection(*[arch.include_dirs for arch in self.arch.values()])
self.deps.update(set.intersection(*[arch.deps for arch in self.arch.values()]))
# Deduplicate arch-dependent properties
for arch in self.arch.keys():
@@ -201,6 +203,8 @@ class GnParser(object):
self.arch[arch].cflags -= self.cflags
self.arch[arch].defines -= self.defines
self.arch[arch].include_dirs -= self.include_dirs
self.arch[arch].deps -= self.deps
def __init__(self):
self.all_targets = {}
@@ -345,7 +349,7 @@ class GnParser(object):
if proto_target_type is None:
target.deps.add(dep.name)
elif dep.type in LINKER_UNIT_TYPES:
target.deps.add(dep.name)
target.arch[arch].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
@@ -355,10 +359,12 @@ class GnParser(object):
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.arch[arch].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)
if arch in dep.arch:
target.arch[arch].transitive_static_libs_deps.update(
dep.arch[arch].transitive_static_libs_deps)
target.arch[arch].deps.update(target.arch[arch].transitive_static_libs_deps)
# Collect java sources. Java sources are kept inside the __compile_java target.
# This target can be used for both host and target compilation; only add