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

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

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

Change-Id: I61dc551e4daf2029ba220956dcdda752cb027407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-12-05 06:05:30 +00:00
committed by Automerger Merge Worker
parent e1502b91d8 e4be5409a9
commit d43082e6ca
1 changed files with 8 additions and 2 deletions
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 { type stubLibraries struct {
stubLibraryMap map[string]bool stubLibraryMap map[string]bool
stubVendorLibraryMap map[string]bool
apiListCoverageXmlPaths []string apiListCoverageXmlPaths []string
} }
@@ -54,6 +55,9 @@ func (s *stubLibraries) GenerateBuildActions(ctx android.SingletonContext) {
if IsStubTarget(m) { if IsStubTarget(m) {
if name := getInstalledFileName(m); name != "" { if name := getInstalledFileName(m); name != "" {
s.stubLibraryMap[name] = true s.stubLibraryMap[name] = true
if m.InVendor() {
s.stubVendorLibraryMap[name] = true
}
} }
} }
if m.library != nil { if m.library != nil {
@@ -67,13 +71,15 @@ func (s *stubLibraries) GenerateBuildActions(ctx android.SingletonContext) {
func stubLibrariesSingleton() android.Singleton { func stubLibrariesSingleton() android.Singleton {
return &stubLibraries{ return &stubLibraries{
stubLibraryMap: make(map[string]bool), stubLibraryMap: make(map[string]bool),
stubVendorLibraryMap: make(map[string]bool),
} }
} }
func (s *stubLibraries) MakeVars(ctx android.MakeVarsContext) { func (s *stubLibraries) MakeVars(ctx android.MakeVarsContext) {
// Convert stub library file names into Makefile variable. // Convert stub library file names into Makefile variable.
ctx.Strict("STUB_LIBRARIES", strings.Join(android.SortedKeys(s.stubLibraryMap), " ")) 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. // Export the list of API XML files to Make.
sort.Strings(s.apiListCoverageXmlPaths) sort.Strings(s.apiListCoverageXmlPaths)