diff options
| author | Chris Parsons <cparsons@google.com> | 2021-10-14 18:43:51 -0400 |
|---|---|---|
| committer | Chris Parsons <cparsons@google.com> | 2021-10-19 16:55:52 -0400 |
| commit | 787fb3618948fa866f01762f624a38a3f7b299fc (patch) | |
| tree | b297221d0ee2ed41f850b7b75231166b6c9f44c6 /cc/library_headers.go | |
| parent | a8b37dd7f1f45f97138260632b56b57d09119068 (diff) | |
| download | soong-787fb3618948fa866f01762f624a38a3f7b299fc.tar.gz | |
Add OS to configuration key in mixed builds
This also removes the special-case filegroup from mixed builds
buildroot; no special handling is required. Since we're currently
hardcoding linux_x86_64 as our host platform, it should be fine
to continue assumping that hardcoded host for now.
Test: USE_BAZEL_ANALYSIS=1 m adbd
Change-Id: I35509f4eb33ba7a243fab4c34b35958f6f2fceab
Diffstat (limited to 'cc/library_headers.go')
| -rw-r--r-- | cc/library_headers.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/library_headers.go b/cc/library_headers.go index 51c1eb828..b2b3dbce9 100644 --- a/cc/library_headers.go +++ b/cc/library_headers.go @@ -57,7 +57,7 @@ type libraryHeaderBazelHander struct { func (h *libraryHeaderBazelHander) GenerateBazelBuildActions(ctx android.ModuleContext, label string) bool { bazelCtx := ctx.Config().BazelContext - ccInfo, ok, err := bazelCtx.GetCcInfo(label, ctx.Arch().ArchType) + ccInfo, ok, err := bazelCtx.GetCcInfo(label, android.GetConfigKey(ctx)) if err != nil { ctx.ModuleErrorf("Error getting Bazel CcInfo: %s", err) return false |