Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Issue 2336173003: Fix android depfiles to always list GN's outputs[0] (Closed)

Created:
4 years, 3 months ago by agrieve
Modified:
4 years, 3 months ago
Reviewers:
Dirk Pranke, jbudorick, mef
CC:
chromium-reviews, cbentzel+watch_chromium.org, jbudorick+watch_chromium.org, mikecase+watch_chromium.org
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

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 Committed: https://crrev.com/4eb18a55cde4daf2ef43330d0304ec73ef546f96 Cr-Commit-Position: refs/heads/master@{#418455}

Patch Set 1 #

Total comments: 1

Patch Set 2 : fix cronet_package #

Unified diffs Side-by-side diffs Delta from patch set Stats (+75 lines, -210 lines) Patch
M base/android/jni_generator/jni_generator.py View 1 chunk +1 line, -3 lines 0 comments Download
M build/android/BUILD.gn View 1 chunk +0 lines, -1 line 0 comments Download
M build/android/findbugs_diff.py View 1 chunk +2 lines, -4 lines 0 comments Download
M build/android/gn/zip.py View 1 chunk +1 line, -3 lines 0 comments Download
M build/android/gyp/aidl.py View 1 chunk +1 line, -3 lines 0 comments Download
D build/android/gyp/ant.py View 1 chunk +0 lines, -65 lines 0 comments Download
M build/android/gyp/copy_ex.py View 1 chunk +2 lines, -3 lines 0 comments Download
M build/android/gyp/create_dist_jar.py View 1 chunk +1 line, -3 lines 0 comments Download
M build/android/gyp/create_java_binary_script.py View 1 chunk +1 line, -3 lines 0 comments Download
M build/android/gyp/create_test_runner_script.py View 1 chunk +1 line, -3 lines 0 comments Download
M build/android/gyp/emma_instr.py View 1 chunk +1 line, -2 lines 0 comments Download
M build/android/gyp/find_sun_tools_jar.py View 1 chunk +1 line, -3 lines 0 comments Download
M build/android/gyp/gcc_preprocess.py View 1 chunk +1 line, -3 lines 0 comments Download
M build/android/gyp/generate_split_manifest.py View 1 chunk +2 lines, -3 lines 0 comments Download
M build/android/gyp/jar_toc.py View 1 chunk +1 line, -8 lines 0 comments Download
M build/android/gyp/java_cpp_enum.py View 1 chunk +8 lines, -59 lines 0 comments Download
M build/android/gyp/jinja_template.py View 1 chunk +3 lines, -2 lines 0 comments Download
M build/android/gyp/locale_pak_resources.py View 1 chunk +2 lines, -2 lines 0 comments Download
M build/android/gyp/pack_relocations.py View 1 chunk +2 lines, -3 lines 0 comments Download
M build/android/gyp/util/build_utils.py View 2 chunks +12 lines, -6 lines 0 comments Download
M build/android/gyp/write_build_config.py View 2 chunks +2 lines, -2 lines 0 comments Download
M build/android/gyp/write_ordered_libraries.py View 1 chunk +1 line, -3 lines 0 comments Download
M build/android/incremental_install/create_install_script.py View 1 chunk +1 line, -3 lines 0 comments Download
M build/android/incremental_install/generate_android_manifest.py View 1 chunk +2 lines, -3 lines 0 comments Download
M build/config/android/internal_rules.gni View 1 chunk +1 line, -1 line 0 comments Download
M build/config/zip.gni View 1 chunk +0 lines, -1 line 0 comments Download
M build/protoc_java.py View 1 chunk +3 lines, -3 lines 0 comments Download
M components/cronet/android/BUILD.gn View 1 4 chunks +9 lines, -2 lines 0 comments Download
M components/cronet/tools/extract_from_jars.py View 1 1 chunk +2 lines, -2 lines 0 comments Download
M components/cronet/tools/generate_javadoc.py View 2 chunks +7 lines, -4 lines 0 comments Download
M components/cronet/tools/jar_src.py View 1 chunk +4 lines, -4 lines 0 comments Download

Messages

Total messages: 17 (9 generated)
agrieve
dpranke - Please review main changes mef - Please review cronet/
4 years, 3 months ago (2016-09-13 20:40:38 UTC) #4
mef
lgtm
4 years, 3 months ago (2016-09-13 20:46:15 UTC) #5
Dirk Pranke
lgtm.
4 years, 3 months ago (2016-09-13 21:03:20 UTC) #6
jbudorick
https://codereview.chromium.org/2336173003/diff/1/build/android/gyp/util/build_utils.py File build/android/gyp/util/build_utils.py (right): https://codereview.chromium.org/2336173003/diff/1/build/android/gyp/util/build_utils.py#newcode434 build/android/gyp/util/build_utils.py:434: depfile.write(first_gn_output.replace(' ', '\\ ')) Heads up: this broke the ...
4 years, 3 months ago (2016-09-13 21:43:27 UTC) #8
agrieve
On 2016/09/13 21:43:27, jbudorick wrote: > https://codereview.chromium.org/2336173003/diff/1/build/android/gyp/util/build_utils.py > File build/android/gyp/util/build_utils.py (right): > > https://codereview.chromium.org/2336173003/diff/1/build/android/gyp/util/build_utils.py#newcode434 > ...
4 years, 3 months ago (2016-09-14 00:16:10 UTC) #11
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2336173003/20001
4 years, 3 months ago (2016-09-14 00:27:17 UTC) #14
commit-bot: I haz the power
Committed patchset #2 (id:20001)
4 years, 3 months ago (2016-09-14 02:04:44 UTC) #15
commit-bot: I haz the power
4 years, 3 months ago (2016-09-14 02:06:29 UTC) #17
Message was sent while issue was closed.
Patchset 2 (id:??) landed as
https://crrev.com/4eb18a55cde4daf2ef43330d0304ec73ef546f96
Cr-Commit-Position: refs/heads/master@{#418455}

Powered by Google App Engine
This is Rietveld 408576698