commit 706955670be499ea3c04942f5bf382ecae409b83
author Patrick Rohr <prohr@google.com> Wed Dec 14 19:45:34 2022 -0800
committer Patrick Rohr <prohr@google.com> Wed Dec 14 21:37:50 2022 -0800
tree 7ed2752f608b4f527a049c88853127a0b66f77a0
parent 94c2490d7facd1c517121bbe4f8885eb612e3666

gn2bp: correctly flatten source_sets under linker unit target

Test: none
Change-Id: I23d13c7168a32db8bbb47a326cbadd117da0199c

tools/gn2bp/gn_utils.py

diff --git a/tools/gn2bp/gn_utils.py b/tools/gn2bp/gn_utils.py
index f45a6b6..349723e 100644
--- a/tools/gn2bp/gn_utils.py
+++ b/tools/gn2bp/gn_utils.py
@@ -403,6 +403,9 @@
       elif dep.type == 'source_set':
         target.arch[arch].source_set_deps.add(dep.name)
         target.arch[arch].source_set_deps.update(dep.arch[arch].source_set_deps)
+        # flatten source_set deps
+        if target.is_linker_unit_type():
+          target.arch[arch].deps.update(target.arch[arch].source_set_deps)
       elif dep.type == 'group':
         target.update(dep, arch)  # Bubble up groups's cflags/ldflags etc.
       elif dep.type in ['action', 'action_foreach', 'copy']: