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

Merge "Only output make targets for uninstallable static libs in the APEX unavailable-to-platform case."

Browse Source
This commit is contained in:
Martin Stjernholm
2020-08-07 11:30:29 +00:00
committed by Gerrit Code Review
parent 9bf3042493 9e9bb7f223
commit 9f381d5ce3
7 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/androidmk.go
View File

@@ -286,10 +286,8 @@ func (library *libraryDecorator) AndroidMkEntries(ctx AndroidMkContext, entries
entries.SubName = "." + library.stubsVersion()
}
entries.ExtraEntries = append(entries.ExtraEntries, func(entries *android.AndroidMkEntries) {
// Note library.skipInstall() has a special case to get here for static
// libraries that otherwise would have skipped installation and hence not
// have executed AndroidMkEntries at all. The reason is to ensure they get
// a NOTICE file make target which other libraries might depend on.
// library.makeUninstallable() depends on this to bypass SkipInstall() for
// static libraries.
entries.SetBool("LOCAL_UNINSTALLABLE_MODULE", true)
if library.buildStubs() {
entries.SetBool("LOCAL_NO_NOTICE_FILE", true)

8
cc/cc.go
View File

@@ -418,7 +418,7 @@ type installer interface {
inSanitizerDir() bool
hostToolPath() android.OptionalPath
relativeInstallPath() string
skipInstall(mod *Module)
makeUninstallable(mod *Module)
}
type xref interface {
@@ -2730,12 +2730,12 @@ func (c *Module) InstallInRecovery() bool {
return c.InRecovery()
}
func (c *Module) SkipInstall() {
func (c *Module) MakeUninstallable() {
if c.installer == nil {
c.ModuleBase.SkipInstall()
c.ModuleBase.MakeUninstallable()
return
}
c.installer.skipInstall(c)
c.installer.makeUninstallable(c)
}
func (c *Module) HostToolPath() android.OptionalPath {

4
cc/installer.go
View File

@@ -107,6 +107,6 @@ func (installer *baseInstaller) relativeInstallPath() string {
return String(installer.Properties.Relative_install_path)
}
func (installer *baseInstaller) skipInstall(mod *Module) {
mod.ModuleBase.SkipInstall()
func (installer *baseInstaller) makeUninstallable(mod *Module) {
mod.ModuleBase.MakeUninstallable()
}

13
cc/library.go
View File

@@ -1365,16 +1365,15 @@ func (library *libraryDecorator) availableFor(what string) bool {
return android.CheckAvailableForApex(what, list)
}
func (library *libraryDecorator) skipInstall(mod *Module) {
func (library *libraryDecorator) makeUninstallable(mod *Module) {
if library.static() && library.buildStatic() && !library.buildStubs() {
// If we're asked to skip installation of a static library (in particular
// when it's not //apex_available:platform) we still want an AndroidMk entry
// for it to ensure we get the relevant NOTICE file targets (cf.
// notice_files.mk) that other libraries might depend on. AndroidMkEntries
// always sets LOCAL_UNINSTALLABLE_MODULE for these entries.
// If we're asked to make a static library uninstallable we don't do
// anything since AndroidMkEntries always sets LOCAL_UNINSTALLABLE_MODULE
// for these entries. This is done to still get the make targets for NOTICE
// files from notice_files.mk, which other libraries might depend on.
return
}
mod.ModuleBase.SkipInstall()
mod.ModuleBase.MakeUninstallable()
}
var versioningMacroNamesListKey = android.NewOnceKey("versioningMacroNamesList")

5
cc/prebuilt.go
View File

@@ -199,10 +199,6 @@ func (p *prebuiltLibraryLinker) disablePrebuilt() {
p.properties.Srcs = nil
}
func (p *prebuiltLibraryLinker) skipInstall(mod *Module) {
mod.ModuleBase.SkipInstall()
}
func NewPrebuiltLibrary(hod android.HostOrDeviceSupported) (*Module, *libraryDecorator) {
module, library := NewLibrary(hod)
module.compiler = nil
@@ -211,7 +207,6 @@ func NewPrebuiltLibrary(hod android.HostOrDeviceSupported) (*Module, *libraryDec
libraryDecorator: library,
}
module.linker = prebuilt
module.installer = prebuilt
module.AddProperties(&prebuilt.properties)