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

Merge "Switch default for InstallBypassMake to true" am: 9579f4c05d

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

Change-Id: If05a5d88c3e86553936634b75706c2ae167c742f
This commit is contained in:
Colin Cross
2021-11-30 20:47:13 +00:00
committed by Automerger Merge Worker
parent 06ca0a8871 9579f4c05d
commit d8c4562f7b
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/module.go
View File

@@ -1702,7 +1702,7 @@ func (m *ModuleBase) InstallInRoot() bool {
} }
func (m *ModuleBase) InstallBypassMake() bool { func (m *ModuleBase) InstallBypassMake() bool {
return false return true
} }
func (m *ModuleBase) InstallForceOS() (*OsType, *ArchType) { func (m *ModuleBase) InstallForceOS() (*OsType, *ArchType) {

6
python/androidmk.go
View File

@@ -75,12 +75,6 @@ func (p *testDecorator) AndroidMk(base *Module, entries *android.AndroidMkEntrie
} }
func (installer *pythonInstaller) AndroidMk(base *Module, entries *android.AndroidMkEntries) { func (installer *pythonInstaller) AndroidMk(base *Module, entries *android.AndroidMkEntries) {
// Soong installation is only supported for host modules. Have Make
// installation trigger Soong installation.
if base.Target().Os.Class == android.Host {
entries.OutputFile = android.OptionalPathForPath(installer.path)
}
entries.Required = append(entries.Required, "libc++") entries.Required = append(entries.Required, "libc++")
entries.ExtraEntries = append(entries.ExtraEntries, entries.ExtraEntries = append(entries.ExtraEntries,
func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {