Revert "Only enable rust_toolchain_filegroup targets on Linux hosts"
Revert submission 3462981-rust-toolchain-filegroup
Reason for revert: A simpler solution was implemented in the Rust toolchain build script
Reverted changes: /q/submissionid:3462981-rust-toolchain-filegroup
Change-Id: I0683754690ea81de12949cae611d6d5dc89b0da6
diff --git a/soong/toolchain_filegroup.go b/soong/toolchain_filegroup.go
index bcfcc1d..ef4630f 100644
--- a/soong/toolchain_filegroup.go
+++ b/soong/toolchain_filegroup.go
@@ -18,13 +18,10 @@
import (
"path"
- "runtime"
"android/soong/android"
"android/soong/rust"
"android/soong/rust/config"
-
- "github.com/google/blueprint/proptools"
)
// This module contains logic for defining file groups inside of a Rust
@@ -54,17 +51,10 @@
func rustSetToolchainFileGroupSource(ctx android.LoadHookContext, inProps *toolchainFilegroupProps) {
type props struct {
- Srcs []string
- Enabled *bool
+ Srcs []string
}
p := &props{}
- if runtime.GOOS == "linux" {
- p.Enabled = proptools.BoolPtr(true)
- } else {
- p.Enabled = proptools.BoolPtr(false)
- }
-
prebuiltsDir := path.Join(config.HostPrebuiltTag(ctx.Config()), rust.GetRustPrebuiltVersion(ctx))
for _, src := range inProps.Toolchain_srcs {
p.Srcs = append(p.Srcs, path.Join(prebuiltsDir, src))
