diff options
| author | 2023-09-21 06:21:21 +0000 | |
|---|---|---|
| committer | 2023-09-21 08:15:36 +0000 | |
| commit | 476e87611960f81f11c7cb051c9009109a410e8b (patch) | |
| tree | 565ed4c600e7daae1ea555c3accbebfbcc2f8070 /rust/rust.go | |
| parent | fbec3a5f5c10fc7376665d7bf8e6bb1c2467fae0 (diff) | |
remove rust deps on clang prebuilts
Prebuilt modules for some clang tools were created in aosp/2746469, but they do not exist for darwin builds. Adding the same modules in prebuilts/clang/host/darwin-x86/Android.bp results in duplicate module names. Instead we can just get a path to these files directly in Soong.
Test: CI
Test: https://android-build.googleplex.com/builds/abtd/run/L90700000963131594
Change-Id: I620cfd7b1ab34bd0959feea562d599b963717198
Diffstat (limited to 'rust/rust.go')
| -rw-r--r-- | rust/rust.go | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/rust/rust.go b/rust/rust.go index 6d6b55efe..26e3ffcac 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -472,13 +472,6 @@ 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 @@ -1480,18 +1473,9 @@ 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, "")) @@ -1612,13 +1596,6 @@ 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}) |