From f6d300662e6972961dcef03b23cb034ceec86c30 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Fri, 1 Jun 2018 10:58:58 -0700
Subject: [PATCH] Allow more PATH tools, expose HOST_STRIP

atree was using the host's strip tool during sdk generation, so expose
the prebuilt for use instead.

`id` was used with a test running minijail0 during the build

`sha1sum` is used by development/build/tools/mk_sdk_repo_xml.sh

`rmdir` was being used to remove some tmp files

Test: m PRODUCT-sdk_arm64-sdk dist sdk_repo
Test: Run other builds through forrest
Change-Id: I49c756a3e9497c0bbd9030754e6aa193a2d989a4
---
 cc/makevars.go           | 2 +-
 ui/build/paths/config.go | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cc/makevars.go b/cc/makevars.go
index bb81dcb9f..8177aa88f 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -312,6 +312,7 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
 
 	ctx.Strict(makePrefix+"CC", gccCmd(toolchain, "gcc"))
 	ctx.Strict(makePrefix+"CXX", gccCmd(toolchain, "g++"))
+	ctx.Strict(makePrefix+"STRIP", gccCmd(toolchain, "strip"))
 
 	if target.Os == android.Darwin {
 		ctx.Strict(makePrefix+"AR", "${config.MacArPath}")
@@ -328,7 +329,6 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
 	if target.Os.Class == android.Device {
 		ctx.Strict(makePrefix+"OBJCOPY", gccCmd(toolchain, "objcopy"))
 		ctx.Strict(makePrefix+"LD", gccCmd(toolchain, "ld"))
-		ctx.Strict(makePrefix+"STRIP", gccCmd(toolchain, "strip"))
 		ctx.Strict(makePrefix+"GCC_VERSION", toolchain.GccVersion())
 		ctx.Strict(makePrefix+"NDK_GCC_VERSION", toolchain.GccVersion())
 		ctx.Strict(makePrefix+"NDK_TRIPLE", config.NDKTriple(toolchain))
diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go
index 548b03858..f044971e6 100644
--- a/ui/build/paths/config.go
+++ b/ui/build/paths/config.go
@@ -83,6 +83,7 @@ var Configuration = map[string]PathConfig{
 	"head":      Allowed,
 	"hexdump":   Allowed,
 	"hostname":  Allowed,
+	"id":        Allowed,
 	"jar":       Allowed,
 	"java":      Allowed,
 	"javap":     Allowed,
@@ -104,11 +105,13 @@ var Configuration = map[string]PathConfig{
 	"readlink":  Allowed,
 	"realpath":  Allowed,
 	"rm":        Allowed,
+	"rmdir":     Allowed,
 	"rsync":     Allowed,
 	"runalarm":  Allowed,
 	"sed":       Allowed,
 	"setsid":    Allowed,
 	"sh":        Allowed,
+	"sha1sum":   Allowed,
 	"sha256sum": Allowed,
 	"sha512sum": Allowed,
 	"sort":      Allowed,