aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-05-17 10:11:17 -0700
committerDan Willemsen <dwillemsen@google.com>2018-05-17 10:11:17 -0700
commita10504e3ac6ecbbe6ae4204c12b238fef12a64d3 (patch)
treef9dcc241491223b8eabe085ede4f5b03d4dcf1f2
parent5e011a2531c396421e9aeeb3031b790c5d121b13 (diff)
downloadbuild_soong-a10504e3ac6ecbbe6ae4204c12b238fef12a64d3.tar.gz
build_soong-a10504e3ac6ecbbe6ae4204c12b238fef12a64d3.tar.bz2
build_soong-a10504e3ac6ecbbe6ae4204c12b238fef12a64d3.zip
Run dep_fixer for java too
Test: treehugger Change-Id: I22fd9861f5a93842dc92365af1378235c171bb05
-rw-r--r--java/proto.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/proto.go b/java/proto.go
index 3ec2e8a6..58b039ec 100644
--- a/java/proto.go
+++ b/java/proto.go
@@ -24,6 +24,7 @@ import (
func init() {
pctx.HostBinToolVariable("protocCmd", "aprotoc")
+ pctx.HostBinToolVariable("depFixCmd", "dep_fixer")
}
var (
@@ -31,9 +32,11 @@ var (
blueprint.RuleParams{
Command: `rm -rf $out.tmp && mkdir -p $out.tmp && ` +
`$protocCmd $protoOut=$protoOutParams:$out.tmp --dependency_out=$out.d -I $protoBase $protoFlags $in && ` +
+ `$depFixCmd $out.d && ` +
`${config.SoongZipCmd} -jar -o $out -C $out.tmp -D $out.tmp && rm -rf $out.tmp`,
CommandDeps: []string{
"$protocCmd",
+ "$depFixCmd",
"${config.SoongZipCmd}",
},
Depfile: "${out}.d",