commit ee94d6ab14ee9480e9c68ca9616698ba2bd93e70
author Colin Cross <ccross@android.com> Mon Jul 08 17:08:34 2019 -0700
committer Colin Cross <ccross@android.com> Thu Jul 11 13:05:19 2019 -0700
tree d56576f100e7d7cee2f16c47f0d9bf5ecee52c3b
parent a3002fc7abb9d3691b1f4d4316a1c4ee256c79dd

Add RuleBuilder helper functions for built and prebuilt tools

Replace the common pattern of:
cmd.Tool(ctx.Config().HostToolPath(ctx, "tool"))
with:
cmd.BuiltTool("tool")

And similarly for PrebuiltBuildTool.

Test: m checkbuild
Change-Id: I7d63188505362c7df6a3b3e7330b4a2cca5a2409

java/proto.go

diff --git a/java/proto.go b/java/proto.go
index 37de1d2..0ec6499 100644
--- a/java/proto.go
+++ b/java/proto.go
@@ -34,7 +34,7 @@
 	// Proto generated java files have an unknown package name in the path, so package the entire output directory
 	// into a srcjar.
 	rule.Command().
-		Tool(ctx.Config().HostToolPath(ctx, "soong_zip")).
+		BuiltTool(ctx, "soong_zip").
 		Flag("-jar").
 		FlagWithOutput("-o ", srcJarFile).
 		FlagWithArg("-C ", outDir.String()).