tree 22e141123eb456a6ccb62c07bee084f4b97afc08
parent 9977ea4a54fce9c3feaad84a8e6051d3770235d3
author sdefresne <sdefresne@chromium.org> 1467379787 -0700
committer Commit bot <commit-bot@chromium.org> 1467379877 +0000

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

Review-Url: https://codereview.chromium.org/2101923006
Cr-Original-Commit-Position: refs/heads/master@{#403446}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 3fed8056522b525d1ee49acc5a04c6b3c3c229bb