tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
commit 6f37dba455
3 changed files with 3 additions and 18 deletions
Show stats 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() {
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

6
cc/library.go
View file

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

12
cc/stub_library.go
View file

@ -15,7 +15,6 @@
package cc
import (
"sort"
"strings"
"android/soong/android"
@ -28,8 +27,6 @@ func init() {
type stubLibraries struct {
stubLibraryMap map[string]bool
apiListCoverageXmlPaths []string
}
// 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
}
}
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) {
// Convert stub library file names into Makefile variable.
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, " "))
}