Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9579f4c0 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Switch default for InstallBypassMake to true"

parents 413da041 d5e7af90

android/module.go

+1 −1
Original line number Diff line number Diff line
@@ -1702,7 +1702,7 @@ func (m *ModuleBase) InstallInRoot() bool { 
}



func (m *ModuleBase) InstallBypassMake() bool {

	return false

	return true

}



func (m *ModuleBase) InstallForceOS() (*OsType, *ArchType) {

python/androidmk.go

+0 −6
Original line number Diff line number Diff line
@@ -75,12 +75,6 @@ func (p *testDecorator) AndroidMk(base *Module, entries *android.AndroidMkEntrie 
}



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.ExtraEntries = append(entries.ExtraEntries,

		func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {