Merge changes I52f88bfd,I4263b7d5

* changes:
  Fix usage of bytes.NewBuffer in bpfix
  Add a dependency fixer for proto deps
This commit is contained in:
android-build-prod (mdb)
2018-05-08 01:05:10 +00:00
committed by Gerrit Code Review
14 changed files with 817 additions and 17 deletions

View File

@@ -30,12 +30,14 @@ var (
proto = pctx.AndroidStaticRule("protoc",
blueprint.RuleParams{
Command: `rm -rf $out.tmp && mkdir -p $out.tmp && ` +
`$protocCmd $protoOut=$protoOutParams:$out.tmp -I $protoBase $protoFlags $in && ` +
`$protocCmd $protoOut=$protoOutParams:$out.tmp --dependency_out=$out.d -I $protoBase $protoFlags $in && ` +
`${config.SoongZipCmd} -jar -o $out -C $out.tmp -D $out.tmp && rm -rf $out.tmp`,
CommandDeps: []string{
"$protocCmd",
"${config.SoongZipCmd}",
},
Depfile: "${out}.d",
Deps: blueprint.DepsGCC,
}, "protoBase", "protoFlags", "protoOut", "protoOutParams")
)