commit 7a346cdaa0a194628e7cbad2650ed10e42e0e5cb
author Sam Delmerico <delmerico@google.com> Mon Sep 25 12:13:17 2023 +0000
committer Sam Delmerico <delmerico@google.com> Wed Sep 27 20:45:48 2023 +0000
tree 0a8db73969575e950d81fc9e768fcdf7da82063f
parent aaf91a48e92a07f5fa9acc03699d53a072466292

Revert^2 "rustSetToolchainSource to use linux-x86 srcs"

7ba7e8232bc4343eed51b40b6a766931e0c23231

Change-Id: Ia10aede6a8b7422848146500506458ae495f7b9a

rust/toolchain_library.go

diff --git a/rust/toolchain_library.go b/rust/toolchain_library.go
index cb345a4..054104c 100644
--- a/rust/toolchain_library.go
+++ b/rust/toolchain_library.go
@@ -89,7 +89,7 @@
 
 func rustSetToolchainSource(ctx android.LoadHookContext) {
 	if toolchainLib, ok := ctx.Module().(*Module).compiler.(*toolchainLibraryDecorator); ok {
-		prefix := filepath.Join(config.HostPrebuiltTag(ctx.Config()), GetRustPrebuiltVersion(ctx))
+		prefix := filepath.Join("linux-x86", 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 {