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

Merge "Revert "Export SOONG_CC_API_XML to Make outside androidmk""

Browse Source
This commit is contained in:
Colin Cross
2021-09-30 03:15:17 +00:00
committed by Gerrit Code Review
parent 1cd6d8e25e 2cec05d37b
commit 6f37dba455
3 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cc/androidmk.go
View File

@@ -294,6 +294,9 @@ func (library *libraryDecorator) AndroidMkEntries(ctx AndroidMkContext, entries
if library.buildStubs() { if library.buildStubs() {
entries.SetBool("LOCAL_NO_NOTICE_FILE", true) entries.SetBool("LOCAL_NO_NOTICE_FILE", true)
} }
if library.apiListCoverageXmlPath.String() != "" {
entries.SetString("SOONG_CC_API_XML", "$(SOONG_CC_API_XML) "+library.apiListCoverageXmlPath.String())
}
}) })
} }
// If a library providing a stub is included in an APEX, the private APIs of the library // If a library providing a stub is included in an APEX, the private APIs of the library

6
cc/library.go
View File

@@ -1035,8 +1035,6 @@ type libraryInterface interface {
androidMkWriteAdditionalDependenciesForSourceAbiDiff(w io.Writer) androidMkWriteAdditionalDependenciesForSourceAbiDiff(w io.Writer)
availableFor(string) bool availableFor(string) bool
getAPIListCoverageXMLPath() android.ModuleOutPath
} }
type versionedInterface interface { type versionedInterface interface {
@@ -1973,10 +1971,6 @@ func (library *libraryDecorator) makeUninstallable(mod *Module) {
mod.ModuleBase.MakeUninstallable() mod.ModuleBase.MakeUninstallable()
} }
func (library *libraryDecorator) getAPIListCoverageXMLPath() android.ModuleOutPath {
return library.apiListCoverageXmlPath
}
var versioningMacroNamesListKey = android.NewOnceKey("versioningMacroNamesList") var versioningMacroNamesListKey = android.NewOnceKey("versioningMacroNamesList")
// versioningMacroNamesList returns a singleton map, where keys are "version macro names", // versioningMacroNamesList returns a singleton map, where keys are "version macro names",

12
cc/stub_library.go
View File

@@ -15,7 +15,6 @@
package cc package cc
import ( import (
"sort"
"strings" "strings"
"android/soong/android" "android/soong/android"
@@ -28,8 +27,6 @@ func init() {
type stubLibraries struct { type stubLibraries struct {
stubLibraryMap map[string]bool stubLibraryMap map[string]bool
apiListCoverageXmlPaths []string
} }
// Check if the module defines stub, or itself is stub // Check if the module defines stub, or itself is stub
@@ -56,11 +53,6 @@ func (s *stubLibraries) GenerateBuildActions(ctx android.SingletonContext) {
s.stubLibraryMap[name] = true s.stubLibraryMap[name] = true
} }
} }
if m.library != nil {
if p := m.library.getAPIListCoverageXMLPath().String(); p != "" {
s.apiListCoverageXmlPaths = append(s.apiListCoverageXmlPaths, p)
}
}
} }
}) })
} }
@@ -74,8 +66,4 @@ func stubLibrariesSingleton() android.Singleton {
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.SortedStringKeys(s.stubLibraryMap), " ")) ctx.Strict("STUB_LIBRARIES", strings.Join(android.SortedStringKeys(s.stubLibraryMap), " "))
// Export the list of API XML files to Make.
sort.Strings(s.apiListCoverageXmlPaths)
ctx.Strict("SOONG_CC_API_XML", strings.Join(s.apiListCoverageXmlPaths, " "))
} }