diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-02-21 02:10:29 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-05-07 16:21:59 -0700 |
| commit | 4339853a20bc300968d0389f4f9307ec415d540d (patch) | |
| tree | 3258e9b29d26cafc74123ad21cc557f28cf0c9b1 /python | |
| parent | 470969df19079ad1c2eeb94fcc984ca2ce5e68ab (diff) | |
| download | build_soong-4339853a20bc300968d0389f4f9307ec415d540d.tar.gz build_soong-4339853a20bc300968d0389f4f9307ec415d540d.tar.bz2 build_soong-4339853a20bc300968d0389f4f9307ec415d540d.zip | |
Add a dependency fixer for proto deps
protoc dependency files, at least for C++ outputs, uses the form of:
a/b.c \
a/b.h: <dep1> <dep2>...
Ninja will fail the command when it parses a dep file and there's more
than one output file (even though it doesn't care what the output file
name is). So this tool will parse the original file, and output a
version with only a single output file.
Bug: 67329638
Test: NINJA_ARGS="-t deps ...pb.c" m
Test: NINJA_ARGS="-t deps ...srcjar" m
Test: NINJA_ARGS="-t deps ...srcszip" m
Test: Run dep_fixer across all of taimen's dep files, no failures.
Test: Run dep_fixer against the processed files, no changes.
Test: Run androidmk across all of our Android.mk files, inspect the diffs
Change-Id: I4263b7d5faea37285afa6b24dedf5964aa7d19dc
Diffstat (limited to 'python')
| -rw-r--r-- | python/proto.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/python/proto.go b/python/proto.go index 82ee3cb0..42987fab 100644 --- a/python/proto.go +++ b/python/proto.go @@ -29,12 +29,14 @@ var ( proto = pctx.AndroidStaticRule("protoc", blueprint.RuleParams{ Command: `rm -rf $out.tmp && mkdir -p $out.tmp && ` + - `$protocCmd --python_out=$out.tmp -I $protoBase $protoFlags $in && ` + + `$protocCmd --python_out=$out.tmp --dependency_out=$out.d -I $protoBase $protoFlags $in && ` + `$parCmd -o $out -P $pkgPath -C $out.tmp -D $out.tmp && rm -rf $out.tmp`, CommandDeps: []string{ "$protocCmd", "$parCmd", }, + Depfile: "${out}.d", + Deps: blueprint.DepsGCC, }, "protoBase", "protoFlags", "pkgPath") ) |