From a10504e3ac6ecbbe6ae4204c12b238fef12a64d3 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 17 May 2018 10:11:17 -0700 Subject: [PATCH] Run dep_fixer for java too Test: treehugger Change-Id: I22fd9861f5a93842dc92365af1378235c171bb05 --- java/proto.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/proto.go b/java/proto.go index 3ec2e8a6b..58b039ec7 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",