StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Run dep_fixer for java too"

Browse Source
This commit is contained in:
Treehugger Robot
2018-05-17 18:59:47 +00:00
committed by Gerrit Code Review
parent 8265a8b81f a10504e3ac
commit 6af008fc0f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/proto.go
View File

@@ -24,6 +24,7 @@ import (
func init() { func init() {
pctx.HostBinToolVariable("protocCmd", "aprotoc") pctx.HostBinToolVariable("protocCmd", "aprotoc")
pctx.HostBinToolVariable("depFixCmd", "dep_fixer")
} }
var ( var (
@@ -31,9 +32,11 @@ var (
blueprint.RuleParams{ blueprint.RuleParams{
Command: `rm -rf $out.tmp && mkdir -p $out.tmp && ` + Command: `rm -rf $out.tmp && mkdir -p $out.tmp && ` +
`$protocCmd $protoOut=$protoOutParams:$out.tmp --dependency_out=$out.d -I $protoBase $protoFlags $in && ` + `$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`, `${config.SoongZipCmd} -jar -o $out -C $out.tmp -D $out.tmp && rm -rf $out.tmp`,
CommandDeps: []string{ CommandDeps: []string{
"$protocCmd", "$protocCmd",
"$depFixCmd",
"${config.SoongZipCmd}", "${config.SoongZipCmd}",
}, },
Depfile: "${out}.d", Depfile: "${out}.d",