Snap for 9744603 from 4eb670c2bb6f7e266f274d5ae03580cf2e8fe246 to udc-release

Change-Id: Id69349ab3afe7beec6a19c368e045368f5fe749f

3 files changed, 9 insertions, 2 deletions

diff --git a/core/cc/api_assembly.py b/core/cc/api_assembly.py
index 73d0bf1..8bc4ea3 100644
--- a/core/cc/api_assembly.py
+++ b/core/cc/api_assembly.py
@@ -317,6 +317,7 @@ class CcApiAssemblyContext(object):
                     out=output_so,
                     frontend=context.tools.clang_cxx(),
                 )
+                link_context.add_implicits(api_deps)
                 self._linker.link(ninja, link_context)
 
                 # TODO: Short term hack to make the stub library available to
diff --git a/core/cc/library.py b/core/cc/library.py
index f7c908b..fb3576b 100644
--- a/core/cc/library.py
+++ b/core/cc/library.py
@@ -59,6 +59,10 @@ class LinkContext():
         self.flags = flags
         self.out = out
         self.frontend = frontend
+        self.implicits = [frontend]
+
+    def add_implicits(self, implicits: List[str]):
+        self.implicits.extend(implicits)
 
 class Linker():
 
@@ -76,7 +80,7 @@ class Linker():
         link_action = BuildAction(output=link_context.out,
                 inputs=link_context.objs,
                 rule=link_rule.name,
-                implicits=[link_context.frontend]
+                implicits=link_context.implicits,
                 )
         link_action.add_variable("ldFrontend", link_context.frontend)
         link_action.add_variable("ldFlags", link_context.flags)
diff --git a/inner_build/inner_build_soong.py b/inner_build/inner_build_soong.py
index e51711c..a8a17d4 100755
--- a/inner_build/inner_build_soong.py
+++ b/inner_build/inner_build_soong.py
@@ -71,7 +71,9 @@ class InnerBuildSoong(common.Commands):
         """Run analysis on this tree."""
         cmd = [
             "build/soong/soong_ui.bash", "--build-mode",
-            f"--dir={args.inner_tree}", "-all-modules", "nothing",
+            f"--dir={args.inner_tree}", "-all-modules",
+            "--skip-soong-tests",
+            "nothing",
             "--search-api-dir"
         ]