diff options
| author | 2021-04-02 12:41:32 -0400 | |
|---|---|---|
| committer | 2021-04-13 13:17:12 -0400 | |
| commit | c08897c1e442be2e0f6db99ca310c9dc7c2e3194 (patch) | |
| tree | bd693eb07a3e34c5306a86bcb9f6b7e92af3c67f /rust/compiler.go | |
| parent | 699e218324982be07c431dfa9e1a59e482dc8511 (diff) | |
Add more Rust vendor image support.
This adds Rust vendor image support for all module types except
Rust prebuilts.
Bug: 184042776
Test: New Soong tests.
Test: Example cc_library vendor module can depend on rust_ffi_shared.
Test: Example rust_library vendor-only module compiles.
Change-Id: Iaa30ad51fdaedcbf14687da5472581f6af62ff59
Diffstat (limited to 'rust/compiler.go')
| -rw-r--r-- | rust/compiler.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rust/compiler.go b/rust/compiler.go index aaa192402..bc034d7cc 100644 --- a/rust/compiler.go +++ b/rust/compiler.go @@ -303,7 +303,6 @@ func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps { if ctx.Target().Os == android.BuildOs { stdlib = stdlib + "_" + ctx.toolchain().RustTriple() } - deps.Stdlibs = append(deps.Stdlibs, stdlib) } } @@ -344,6 +343,10 @@ func (compiler *baseCompiler) installDir(ctx ModuleContext) android.InstallPath if !ctx.Host() && ctx.Config().HasMultilibConflict(ctx.Arch().ArchType) { dir = filepath.Join(dir, ctx.Arch().ArchType.String()) } + + if compiler.location == InstallInData && ctx.RustModule().UseVndk() { + dir = filepath.Join(dir, "vendor") + } return android.PathForModuleInstall(ctx, dir, compiler.subDir, compiler.relativeInstallPath(), compiler.relative) } |