Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ba7e823 authored by Colin Cross's avatar Colin Cross
Browse files

Revert "rustSetToolchainSource to use linux-x86 srcs" 

Revert submission 2758566

Reason for revert: b/301463284

Reverted changes: /q/submissionid:2758566

Change-Id: Ia4966732e9bec105c854f09aa0523329ef4d8fd0
parent 05cbcb35

rust/toolchain_library.go

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ func initToolchainLibrary(module *Module, library *libraryDecorator) android.Mod 


func rustSetToolchainSource(ctx android.LoadHookContext) {

	if toolchainLib, ok := ctx.Module().(*Module).compiler.(*toolchainLibraryDecorator); ok {

		prefix := filepath.Join("linux-x86", GetRustPrebuiltVersion(ctx))

		prefix := filepath.Join(config.HostPrebuiltTag(ctx.Config()), GetRustPrebuiltVersion(ctx))

		versionedCrateRoot := path.Join(prefix, android.String(toolchainLib.Properties.Toolchain_crate_root))

		versionedSrcs := make([]string, len(toolchainLib.Properties.Toolchain_srcs))

		for i, src := range toolchainLib.Properties.Toolchain_srcs {