diff options
| author | 2019-10-03 21:50:57 +0000 | |
|---|---|---|
| committer | 2019-10-03 21:50:57 +0000 | |
| commit | 4acb77e76a3b38f429089b651c4a177d0029205d (patch) | |
| tree | da8db546cf3efbb3672d25da99207828720885a6 /rust/compiler.go | |
| parent | 5ffade1efbff770215d055cc36932f088e0a4d99 (diff) | |
| parent | ff6c33d885c8a8132728853a8bd2cfd73988b660 (diff) | |
Merge changes from topic "install"
* changes:
Replace RelPathString() with ToMakePath()
Separate InstallPath from OutputPath
Add InstallInRoot to allow modules to install into root partition
Diffstat (limited to 'rust/compiler.go')
| -rw-r--r-- | rust/compiler.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rust/compiler.go b/rust/compiler.go index 3bfef7693..76d5ad844 100644 --- a/rust/compiler.go +++ b/rust/compiler.go @@ -94,7 +94,7 @@ type baseCompiler struct { dir64 string subDir string relative string - path android.OutputPath + path android.InstallPath } var _ compiler = (*baseCompiler)(nil) @@ -173,7 +173,7 @@ func (compiler *baseCompiler) crateName() string { return compiler.Properties.Crate_name } -func (compiler *baseCompiler) installDir(ctx ModuleContext) android.OutputPath { +func (compiler *baseCompiler) installDir(ctx ModuleContext) android.InstallPath { dir := compiler.dir if ctx.toolchain().Is64Bit() && compiler.dir64 != "" { dir = compiler.dir64 |