Stop calling our host $PATH prebuilts toybox
There's more than just toybox in this group now, so let's rename our
variables to something closer to the desired behavior, rather than the
first user.
Test: treehugger
Change-Id: I76d4407792061c8110b194cfe73f1ddc84dbc22f
diff --git a/ui/build/path.go b/ui/build/path.go
index ee72cfd..5294133 100644
--- a/ui/build/path.go
+++ b/ui/build/path.go
@@ -147,10 +147,11 @@
myPath, _ = filepath.Abs(myPath)
- // Use the toybox prebuilts on linux
+ // We put some prebuilts in $PATH, since it's infeasible to add dependencies for all of
+ // them.
if runtime.GOOS == "linux" {
- toyboxPath, _ := filepath.Abs("prebuilts/build-tools/toybox/linux-x86")
- myPath = toyboxPath + string(os.PathListSeparator) + myPath
+ prebuiltsPath, _ := filepath.Abs("prebuilts/build-tools/path/" + runtime.GOOS + "-x86")
+ myPath = prebuiltsPath + string(os.PathListSeparator) + myPath
}
config.Environment().Set("PATH", myPath)