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

Issue 2105613003: Fix dependencies rules for create_bundle and bundle_data ninja steps. (Closed)

Created:
4 years, 5 months ago by sdefresne
Modified:
4 years, 5 months ago
Reviewers:
Dirk Pranke, brettw
CC:
chromium-reviews, Dirk Pranke, tfarina
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Fix dependencies rules for create_bundle and bundle_data ninja steps. Record the "bundle_data" target corresponding to a BundleFileRule object so that the dependencies can be correctly computed when generating the ninja steps for the "create_bundle" target. Change the "stamp" step of "bundle_data" target in the generated ninja to depends on the target dependencies and source files. Change the "copy_bundle_data" steps of "create_bundle" target in the generated ninja to depends on the "bundle_data" target that defined the corresponding source files. Change the "compile_xcassets" step of "create_bundle" target in the generated ninja to depends on all the "bundle_data" targets that defined the corresponding source files. Change the rule used to determine whether a "bundle_data" source file is part of an assets catalog (some file where incorrectly omitted causing them to be incorrectly copied to the final bundle). All those changes will allow the "copy_bundle_data" and "compile_xcassets" steps to only depends on the targets that generate them (if any) and will reduce the number of file copied into the final bundle during incremental builds. Fix unit tests with new expectations. BUG=623501 Committed: https://crrev.com/4c75ba4852a79bde5ce03ebff7065282c9fd8977 Cr-Commit-Position: refs/heads/master@{#403304}

Patch Set 1 #

Patch Set 2 : Remove stamps (to allow using hardlinks) #

Unified diffs Side-by-side diffs Delta from patch set Stats (+463 lines, -302 lines) Patch
M tools/gn/BUILD.gn View 1 1 chunk +1 line, -0 lines 0 comments Download
M tools/gn/bundle_data.h View 4 chunks +11 lines, -18 lines 0 comments Download
M tools/gn/bundle_data.cc View 6 chunks +42 lines, -24 lines 0 comments Download
M tools/gn/bundle_file_rule.h View 2 chunks +8 lines, -1 line 0 comments Download
M tools/gn/bundle_file_rule.cc View 1 chunk +6 lines, -2 lines 0 comments Download
M tools/gn/gn.gyp View 1 1 chunk +1 line, -0 lines 0 comments Download
M tools/gn/ninja_bundle_data_target_writer.cc View 2 chunks +18 lines, -3 lines 0 comments Download
A tools/gn/ninja_bundle_data_target_writer_unittest.cc View 1 chunk +55 lines, -0 lines 0 comments Download
M tools/gn/ninja_create_bundle_target_writer.h View 2 chunks +25 lines, -19 lines 0 comments Download
M tools/gn/ninja_create_bundle_target_writer.cc View 1 6 chunks +92 lines, -59 lines 0 comments Download
M tools/gn/ninja_create_bundle_target_writer_unittest.cc View 1 4 chunks +200 lines, -173 lines 0 comments Download
M tools/gn/runtime_deps_unittest.cc View 2 chunks +2 lines, -1 line 0 comments Download
M tools/gn/target_unittest.cc View 2 chunks +2 lines, -2 lines 0 comments Download

Dependent Patchsets:

Messages

Total messages: 11 (4 generated)
sdefresne
Please take a look and send to CQ if LGTY.
4 years, 5 months ago (2016-06-28 15:25:12 UTC) #2
sdefresne
Dirk can you take a first look as Brett seems super busy?
4 years, 5 months ago (2016-06-29 07:59:04 UTC) #4
brettw
I did a pretty cursory review and LGTM from that perspective.
4 years, 5 months ago (2016-06-30 21:08:54 UTC) #5
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/2105613003/20001
4 years, 5 months ago (2016-06-30 21:17:40 UTC) #7
commit-bot: I haz the power
Committed patchset #2 (id:20001)
4 years, 5 months ago (2016-06-30 21:59:19 UTC) #8
commit-bot: I haz the power
CQ bit was unchecked.
4 years, 5 months ago (2016-06-30 21:59:39 UTC) #9
commit-bot: I haz the power
4 years, 5 months ago (2016-06-30 22:01:25 UTC) #11
Message was sent while issue was closed.
Patchset 2 (id:??) landed as
https://crrev.com/4c75ba4852a79bde5ce03ebff7065282c9fd8977
Cr-Commit-Position: refs/heads/master@{#403304}

Powered by Google App Engine
This is Rietveld 408576698