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

Issue 2101923006: Fix BundleData::GetBundleRootDirOutput() for non-default toolchain. (Closed)

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

Description

Fix BundleData::GetBundleRootDirOutput() for non-default toolchain. The "create_bundle" targets defines in build/config/{mac,ios}/rules.gni put their outputs in "$root_out_dir". This directory is different from the top-level output directory from BuildSettings and instead correspond to the Settings toolchain output directory. Fix BundleData::GetBundleRootDirOutput() to compute the bundle root directory output relative to the toolchain output directory to fix dependencies when a "create_bundle" target is defined in the non-default toolchain. Fix TestWithScope constructor to ensure that BuildSettings::SetBuildDir call is made before the call to Settings constructor (as the toolchain output directory is initialized from the BuildSettings build_dir). Remove unnecessary calls to setup.build_settings().SetBuildDir() as the value is already set in TestWithScope constructor. BUG=603180 Committed: https://crrev.com/3fed8056522b525d1ee49acc5a04c6b3c3c229bb Cr-Commit-Position: refs/heads/master@{#403446}

Patch Set 1 #

Patch Set 2 : Rebase. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+31 lines, -68 lines) Patch
M tools/gn/bundle_data.cc View 1 chunk +1 line, -1 line 0 comments Download
M tools/gn/function_rebase_path_unittest.cc View 3 chunks +0 lines, -3 lines 0 comments Download
M tools/gn/ninja_action_target_writer_unittest.cc View 7 chunks +7 lines, -16 lines 0 comments Download
M tools/gn/ninja_binary_target_writer_unittest.cc View 8 chunks +8 lines, -24 lines 0 comments Download
M tools/gn/ninja_bundle_data_target_writer_unittest.cc View 1 chunk +0 lines, -2 lines 0 comments Download
M tools/gn/ninja_copy_target_writer_unittest.cc View 3 chunks +3 lines, -7 lines 0 comments Download
M tools/gn/ninja_create_bundle_target_writer_unittest.cc View 1 5 chunks +0 lines, -10 lines 0 comments Download
M tools/gn/ninja_group_target_writer_unittest.cc View 1 chunk +1 line, -3 lines 0 comments Download
M tools/gn/test_with_scope.cc View 1 chunk +11 lines, -2 lines 0 comments Download

Messages

Total messages: 12 (5 generated)
sdefresne
Please take a first look before I send this to Brett. This is a prerequisite ...
4 years, 5 months ago (2016-06-29 10:33:51 UTC) #2
Robert Sesek
LGTM
4 years, 5 months ago (2016-06-29 17:23:04 UTC) #3
sdefresne
brettw: for OWNERS review
4 years, 5 months ago (2016-06-29 17:24:42 UTC) #5
brettw
lgtm
4 years, 5 months ago (2016-06-29 23:04:36 UTC) #6
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/2101923006/10001
4 years, 5 months ago (2016-07-01 12:58:02 UTC) #9
commit-bot: I haz the power
Committed patchset #2 (id:10001)
4 years, 5 months ago (2016-07-01 13:30:06 UTC) #10
commit-bot: I haz the power
4 years, 5 months ago (2016-07-01 13:31:30 UTC) #12
Message was sent while issue was closed.
Patchset 2 (id:??) landed as
https://crrev.com/3fed8056522b525d1ee49acc5a04c6b3c3c229bb
Cr-Commit-Position: refs/heads/master@{#403446}

Powered by Google App Engine
This is Rietveld 408576698