diff options
| author | 2023-09-22 22:02:28 +0000 | |
|---|---|---|
| committer | 2023-09-22 22:02:28 +0000 | |
| commit | 05cbcb3539270763b2fd04e059869ca866d670b8 (patch) | |
| tree | cce63871dbf09f9ad9a0d79f6419a520ce533631 /rust/rust.go | |
| parent | 476e87611960f81f11c7cb051c9009109a410e8b (diff) | |
Revert "remove rust deps on clang prebuilts"
Revert submission 2758566
Reason for revert: b/301463284
Reverted changes: /q/submissionid:2758566
Change-Id: I54f0ecbbd922deb23009ca89ff79689e128f4f31
Diffstat (limited to 'rust/rust.go')
| -rw-r--r-- | rust/rust.go | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/rust/rust.go b/rust/rust.go index 26e3ffcac..6d6b55efe 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -472,6 +472,13 @@ type PathDeps struct { // Paths to generated source files SrcDeps android.Paths srcProviderFiles android.Paths + + // Paths to specific build tools + Rustc android.Path + Clang android.Path + Llvm_ar android.Path + Clippy_driver android.Path + Rustdoc android.Path } type RustLibraries []RustLibrary @@ -1473,9 +1480,18 @@ func (mod *Module) depsToPaths(ctx android.ModuleContext) PathDeps { depPaths.BuildToolDeps = append(depPaths.BuildToolDeps, buildTool.Deps...) switch android.RemoveOptionalPrebuiltPrefix(dep.Name()) { case "rustc": + depPaths.Rustc = buildTool.Src // rustc expects the standard cc toolchain libraries (libdl, libm, libc, etc.) // not to be under the __SBOX_SANDBOX_DIR__/ directory depPaths.BuildToolSrcDeps = append(depPaths.BuildToolSrcDeps, buildTool.Deps...) + case "clang++": + depPaths.Clang = buildTool.Src + case "llvm-ar": + depPaths.Llvm_ar = buildTool.Src + case "clippy-driver": + depPaths.Clippy_driver = buildTool.Src + case "rustdoc": + depPaths.Rustdoc = buildTool.Src } case depTag == cc.CrtBeginDepTag: depPaths.CrtBegin = append(depPaths.CrtBegin, android.OutputFileForModule(ctx, dep, "")) @@ -1596,6 +1612,13 @@ func (mod *Module) DepsMutator(actx android.BottomUpMutatorContext) { } ctx.AddFarVariationDependencies([]blueprint.Variation{}, buildToolDepTag, "rustc") + ctx.AddFarVariationDependencies([]blueprint.Variation{}, buildToolDepTag, "clippy-driver") + ctx.AddFarVariationDependencies([]blueprint.Variation{}, buildToolDepTag, "rustdoc") + ctx.AddFarVariationDependencies([]blueprint.Variation{}, buildToolDepTag, "clang++") + ctx.AddFarVariationDependencies([]blueprint.Variation{}, buildToolDepTag, "clang++.real") + ctx.AddFarVariationDependencies([]blueprint.Variation{}, buildToolDepTag, "lld") + ctx.AddFarVariationDependencies([]blueprint.Variation{}, buildToolDepTag, "ld.lld") + ctx.AddFarVariationDependencies([]blueprint.Variation{}, buildToolDepTag, "llvm-ar") // rlibs rlibDepVariations = append(rlibDepVariations, blueprint.Variation{Mutator: "rust_libraries", Variation: rlibVariation}) |