aboutsummaryrefslogtreecommitdiffstats
path: root/android/proto.go
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-07-08 17:08:34 -0700
committerColin Cross <ccross@android.com>2019-07-11 13:05:19 -0700
commitee94d6ab14ee9480e9c68ca9616698ba2bd93e70 (patch)
treed56576f100e7d7cee2f16c47f0d9bf5ecee52c3b /android/proto.go
parenta3002fc7abb9d3691b1f4d4316a1c4ee256c79dd (diff)
downloadbuild_soong-ee94d6ab14ee9480e9c68ca9616698ba2bd93e70.tar.gz
build_soong-ee94d6ab14ee9480e9c68ca9616698ba2bd93e70.tar.bz2
build_soong-ee94d6ab14ee9480e9c68ca9616698ba2bd93e70.zip
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
Diffstat (limited to 'android/proto.go')
-rw-r--r--android/proto.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/proto.go b/android/proto.go
index 5247c68d..c8ade456 100644
--- a/android/proto.go
+++ b/android/proto.go
@@ -135,7 +135,7 @@ func ProtoRule(ctx ModuleContext, rule *RuleBuilder, protoFile Path, flags Proto
}
rule.Command().
- Tool(ctx.Config().HostToolPath(ctx, "aprotoc")).
+ BuiltTool(ctx, "aprotoc").
FlagWithArg(flags.OutTypeFlag+"=", strings.Join(flags.OutParams, ",")+":"+outDir.String()).
FlagWithDepFile("--dependency_out=", depFile).
FlagWithArg("-I ", protoBase).
@@ -145,5 +145,5 @@ func ProtoRule(ctx ModuleContext, rule *RuleBuilder, protoFile Path, flags Proto
ImplicitOutputs(outputs)
rule.Command().
- Tool(ctx.Config().HostToolPath(ctx, "dep_fixer")).Flag(depFile.String())
+ BuiltTool(ctx, "dep_fixer").Flag(depFile.String())
}