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

Generate vendor specific STUB_LIBRARIES

Browse Source 
When generating vendor/etc/linker.config.pb, STUB_LIBRARIES was used.
Because it lists *all* libraries with stubs regardless of its
install location (vendor or system), using it for vendor
linker.config.pb doesn't make sense. Instead, use vendor-specific
STUB_LIBRARIES, which is named SOONG_STUB_VENDOR_LIBRARIES.

Bug: 313806237
Test: m (aosp_cf_x86_64_phone)
Test: $OUT/vendor/etc/linker.config.pb not listing libz.so
Change-Id: Icd0aaf92d9630c07f58c4739a9f0ac713516db43
This commit is contained in:
Jooyung Han
2023-12-01 16:33:30 +09:00
parent 85707de8c1
commit 9582159c4d
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)