From d5e7af9003eebc3004ed1325e0b489c77e3b0f86 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 4 Nov 2021 17:59:37 -0700
Subject: [PATCH] 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
---
 android/module.go   | 2 +-
 python/androidmk.go | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/android/module.go b/android/module.go
index e100330de..d71884ab3 100644
--- a/android/module.go
+++ b/android/module.go
@@ -1702,7 +1702,7 @@ func (m *ModuleBase) InstallInRoot() bool {
 }
 
 func (m *ModuleBase) InstallBypassMake() bool {
-	return false
+	return true
 }
 
 func (m *ModuleBase) InstallForceOS() (*OsType, *ArchType) {
diff --git a/python/androidmk.go b/python/androidmk.go
index 13b41723e..ccc85ec6a 100644
--- a/python/androidmk.go
+++ b/python/androidmk.go
@@ -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) {