StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support cc_library_shared for mixed builds

Browse Source 
Authors: cparsons, eakammer, jingwen

This CL also contains .toc file integration between Bazel and Make.

Fixes: b/190524879

Test: build/bazel/ci/mixed_droid.sh

Co-authored-by: Christopher Parsons <cparsons@google.com>
Co-authored-by: Liz Kammer <eakammer@google.com>
Co-authored-by: Jingwen Chen <jingwen@google.com>

Change-Id: If484042a58cb9f0db6d30a460f415f5684b4cbf6
This commit is contained in:
Chris Parsons
2021-06-04 15:03:47 -04:00
committed by Jingwen Chen
parent 79e04280ba
commit 94a0bba5a9
8 changed files with 208 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/library_headers.go
View File

@@ -73,13 +73,7 @@ func (h *libraryHeaderBazelHander) generateBazelBuildActions(ctx android.ModuleC
// HeaderLibraryInfo is an empty struct to indicate to dependencies that this is a header library
ctx.SetProvider(HeaderLibraryInfoProvider, HeaderLibraryInfo{})
flagExporterInfo := flagExporterInfoFromCcInfo(ctx, ccInfo)
// Store flag info to be passed along to androimk
// TODO(b/184387147): Androidmk should be done in Bazel, not Soong.
h.library.flagExporterInfo = &flagExporterInfo
// flag exporters consolidates properties like includes, flags, dependencies that should be
// exported from this module to other modules
ctx.SetProvider(FlagExporterInfoProvider, flagExporterInfo)
h.library.setFlagExporterInfoFromCcInfo(ctx, ccInfo)
// Dependencies on this library will expect collectedSnapshotHeaders to be set, otherwise
// validation will fail. For now, set this to an empty list.