diff --git a/rust/androidmk.go b/rust/androidmk.go index e429416ab..c51ba5148 100644 --- a/rust/androidmk.go +++ b/rust/androidmk.go @@ -186,11 +186,7 @@ func (compiler *baseCompiler) AndroidMk(ctx AndroidMkContext, ret *android.Andro } var unstrippedOutputFile android.OptionalPath - // Soong installation is only supported for host modules. Have Make - // installation trigger Soong installation. - if ctx.Target().Os.Class == android.Host { - ret.OutputFile = android.OptionalPathForPath(compiler.path) - } else if compiler.strippedOutputFile.Valid() { + if compiler.strippedOutputFile.Valid() { unstrippedOutputFile = ret.OutputFile ret.OutputFile = compiler.strippedOutputFile } diff --git a/rust/rust.go b/rust/rust.go index c159e4a87..a3702d815 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -1273,6 +1273,10 @@ func (mod *Module) InstallInRecovery() bool { return mod.InRecovery() } +func (mod *Module) InstallBypassMake() bool { + return true +} + func linkPathFromFilePath(filepath android.Path) string { return strings.Split(filepath.String(), filepath.Base())[0] }