Fix android depfiles to always list GN's outputs[0]
Ninja complains with:
expected depfile 'foo.d' to mention 'bar', got 'baz'
Running ninja twice now reports "no work to do" again.
This change required updating all calls to build_utils.WriteDepFile() so
that the output is passed in. While doing this, I also made the helper
add in GetPythonDependencies() by default.
build/android/gyp/ant.py I just deleted rather than updating since it's
GYP-only.
BUG=646165
Review-Url: https://codereview.chromium.org/2336173003
Cr-Commit-Position: refs/heads/master@{#418455}
diff --git a/build/protoc_java.py b/build/protoc_java.py
index 470667c..46fa820 100755
--- a/build/protoc_java.py
+++ b/build/protoc_java.py
@@ -57,9 +57,9 @@
build_utils.ZipDir(options.srcjar, temp_dir)
if options.depfile:
- build_utils.WriteDepfile(
- options.depfile,
- args + [options.protoc] + build_utils.GetPythonDependencies())
+ assert options.srcjar
+ deps = args + [options.protoc]
+ build_utils.WriteDepfile(options.depfile, options.srcjar, deps)
if options.stamp:
build_utils.Touch(options.stamp)
