diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-16 17:58:16 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-16 17:58:16 +0000 |
| commit | 42b013fd9d2870c19d16fb4a1391b2343d29c7d1 (patch) | |
| tree | 00356650d325c919d95525ae1c1f198cbffd402d /tools/gn | |
| parent | 781b9bc6604c58f14103024bea85bb22a4ed776e (diff) | |
| download | chromium_src-42b013fd9d2870c19d16fb4a1391b2343d29c7d1.zip chromium_src-42b013fd9d2870c19d16fb4a1391b2343d29c7d1.tar.gz chromium_src-42b013fd9d2870c19d16fb4a1391b2343d29c7d1.tar.bz2 | |
Hook up GN official build and branding.
This passes the official build and branding flags to the GN build. Currently, this is used to hook up the proper sysroot for compiling on Linux for official builds. The 32-bit branded build does not compile currently due to pending pkgconfig issues.
Fix a bug where assertions in the build config would not get reported properly. This was because I forgot to actually throw the error at the toplevel.
BUG=
R=piman@chromium.org
Review URL: https://codereview.chromium.org/115643002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn')
| -rw-r--r-- | tools/gn/loader.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/gn/loader.cc b/tools/gn/loader.cc index 7e3ca3d..e0a0517 100644 --- a/tools/gn/loader.cc +++ b/tools/gn/loader.cc @@ -293,6 +293,9 @@ void LoaderImpl::BackgroundLoadBuildConfig( trace.Done(); + if (err.has_error()) + g_scheduler->FailWithError(err); + base_config->ClearProcessingBuildConfig(); if (settings->is_default()) { // The default toolchain must have been set in the default build config |