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

Commit d5e7af90 authored Nov 04, 2021 by Colin Cross

Switch default for InstallBypassMake to true

Enable InstallBypassMake for all module types by switching its default
to true.

Bug: 204136549
Test: m checkbuild
Change-Id: Ied082995e74d71dee6aecea99689ac3f63600d3b

parent 6340ea50

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) {