Merge changes from topic "soong-rust-install"
* changes: Move sh_binary module installation into Soong Move rust module installation into Soong
This commit is contained in:
@@ -186,11 +186,7 @@ func (compiler *baseCompiler) AndroidMk(ctx AndroidMkContext, ret *android.Andro
|
|||||||
}
|
}
|
||||||
|
|
||||||
var unstrippedOutputFile android.OptionalPath
|
var unstrippedOutputFile android.OptionalPath
|
||||||
// Soong installation is only supported for host modules. Have Make
|
if compiler.strippedOutputFile.Valid() {
|
||||||
// installation trigger Soong installation.
|
|
||||||
if ctx.Target().Os.Class == android.Host {
|
|
||||||
ret.OutputFile = android.OptionalPathForPath(compiler.path)
|
|
||||||
} else if compiler.strippedOutputFile.Valid() {
|
|
||||||
unstrippedOutputFile = ret.OutputFile
|
unstrippedOutputFile = ret.OutputFile
|
||||||
ret.OutputFile = compiler.strippedOutputFile
|
ret.OutputFile = compiler.strippedOutputFile
|
||||||
}
|
}
|
||||||
|
@@ -1273,6 +1273,10 @@ func (mod *Module) InstallInRecovery() bool {
|
|||||||
return mod.InRecovery()
|
return mod.InRecovery()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (mod *Module) InstallBypassMake() bool {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
func linkPathFromFilePath(filepath android.Path) string {
|
func linkPathFromFilePath(filepath android.Path) string {
|
||||||
return strings.Split(filepath.String(), filepath.Base())[0]
|
return strings.Split(filepath.String(), filepath.Base())[0]
|
||||||
}
|
}
|
||||||
|
@@ -168,6 +168,10 @@ type ShBinary struct {
|
|||||||
|
|
||||||
var _ android.HostToolProvider = (*ShBinary)(nil)
|
var _ android.HostToolProvider = (*ShBinary)(nil)
|
||||||
|
|
||||||
|
func (s *ShBinary) InstallBypassMake() bool {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
type ShTest struct {
|
type ShTest struct {
|
||||||
ShBinary
|
ShBinary
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user