From 7a346cdaa0a194628e7cbad2650ed10e42e0e5cb Mon Sep 17 00:00:00 2001 From: Sam Delmerico Date: Mon, 25 Sep 2023 12:13:17 +0000 Subject: [PATCH] Revert^2 "rustSetToolchainSource to use linux-x86 srcs" 7ba7e8232bc4343eed51b40b6a766931e0c23231 Change-Id: Ia10aede6a8b7422848146500506458ae495f7b9a --- rust/toolchain_library.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/toolchain_library.go b/rust/toolchain_library.go index cb345a4b6..054104ccc 100644 --- a/rust/toolchain_library.go +++ b/rust/toolchain_library.go @@ -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(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 {