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
This commit is contained in:
@@ -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)
|
||||
}
|
||||
|
Reference in New Issue
Block a user