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

Move rust module installation into Soong

Browse Source 
Move rust module installation rules into Soong by overriding
InstallBypassMake.

Bug: 204136549
Bug: 205530905
Test: m checkbuild
Test: m && acloud create --local-instance --local-image
Change-Id: Icc00c4ea5d91ae489c1d9d3b66a072c9de86c717
This commit is contained in:
Colin Cross
2021-11-08 12:37:01 -08:00
parent c602297226
commit 7743557a23
2 changed files with 5 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 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
} }

4
rust/rust.go
View File

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