diff options
| author | 2021-11-08 12:37:01 -0800 | |
|---|---|---|
| committer | 2021-11-08 13:31:51 -0800 | |
| commit | 7743557a23fedaa962c72542b94fe2675d5d9f62 (patch) | |
| tree | 937551b96d34bf514287e3808515f9277b08deeb /rust/androidmk.go | |
| parent | c602297226a35bb3d3f2b6a2949cd67b981370aa (diff) | |
Move rust module installation into Soong
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
Diffstat (limited to 'rust/androidmk.go')
| -rw-r--r-- | rust/androidmk.go | 6 |
1 files changed, 1 insertions, 5 deletions
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 } |