StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "soong-rust-install"

Browse Source 
* changes:
  Move sh_binary module installation into Soong
  Move rust module installation into Soong
This commit is contained in:
Treehugger Robot
2021-11-09 16:29:36 +00:00
committed by Gerrit Code Review
parent ba6d4ac226 7e07e20723
commit f50bfc9d47
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rust/androidmk.go
View File

@@ -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
}

4
rust/rust.go
View File

@@ -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]
}