diff options
| author | Spandan Das <spandandas@google.com> | 2023-03-13 20:36:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-13 20:36:39 +0000 |
| commit | 5a3561b8b137f5f11436d75c7d3f20a367ac369d (patch) | |
| tree | b9db03691594a729d4bcaf31e35bbc5d8ac3c6fc | |
| parent | 3df4bbdf99c066c461405d6b9ee8d57b3d1e828b (diff) | |
| parent | 259573979f5f79a5a93f4f8c7addd9a1566b3618 (diff) | |
| download | orchestrator-5a3561b8b137f5f11436d75c7d3f20a367ac369d.tar.gz | |
Make headers an inorder dep of cc_api_variant.src am: 0860654a67 am: 259573979f
Original change: https://android-review.googlesource.com/c/platform/build/orchestrator/+/2482856
Change-Id: Idb25071249c31e1e42f4dbb2aa4437f79b59cc08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/cc/api_assembly.py | 1 | ||||
| -rw-r--r-- | core/cc/library.py | 6 |
2 files changed, 6 insertions, 1 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) |