tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topics "libz-no-stubs-for-vendor", "vendor-etc-linker-config" into main am: fedbb5c3be

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853092

Change-Id: I696ad0dadb55b47cd303069fb3f9083a4606aa69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-12-05 05:57:04 +00:00 committed by Automerger Merge Worker
commit e4be5409a9
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cc/stub_library.go
View file

@ -27,7 +27,8 @@ func init() {
}
type stubLibraries struct {
stubLibraryMap map[string]bool
stubLibraryMap map[string]bool
stubVendorLibraryMap map[string]bool
apiListCoverageXmlPaths []string
}
@ -54,6 +55,9 @@ func (s *stubLibraries) GenerateBuildActions(ctx android.SingletonContext) {
if IsStubTarget(m) {
if name := getInstalledFileName(m); name != "" {
s.stubLibraryMap[name] = true
if m.InVendor() {
s.stubVendorLibraryMap[name] = true
}
}
}
if m.library != nil {
@ -67,13 +71,15 @@ func (s *stubLibraries) GenerateBuildActions(ctx android.SingletonContext) {
func stubLibrariesSingleton() android.Singleton {
return &stubLibraries{
stubLibraryMap: make(map[string]bool),
stubLibraryMap: make(map[string]bool),
stubVendorLibraryMap: make(map[string]bool),
}
}
func (s *stubLibraries) MakeVars(ctx android.MakeVarsContext) {
// Convert stub library file names into Makefile variable.
ctx.Strict("STUB_LIBRARIES", strings.Join(android.SortedKeys(s.stubLibraryMap), " "))
ctx.Strict("SOONG_STUB_VENDOR_LIBRARIES", strings.Join(android.SortedKeys(s.stubVendorLibraryMap), " "))
// Export the list of API XML files to Make.
sort.Strings(s.apiListCoverageXmlPaths)