diff options
author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 10:17:07 +0000 |
---|---|---|
committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 10:17:07 +0000 |
commit | 96ea63d0d101ebbdbb08f79a80f3fa38bfb27ced (patch) | |
tree | f33c8f6fa3ae9fbba0178ba0cbf4f291fd3ec11e /tools/gn/settings.cc | |
parent | fb68e6c9f20785ccd0024f14b09c200060931953 (diff) | |
download | chromium_src-96ea63d0d101ebbdbb08f79a80f3fa38bfb27ced.zip chromium_src-96ea63d0d101ebbdbb08f79a80f3fa38bfb27ced.tar.gz chromium_src-96ea63d0d101ebbdbb08f79a80f3fa38bfb27ced.tar.bz2 |
Revert 214325 "Revert 214254 "Add initial prototype for the GN m..."
The issue was already fixed :)
> Revert 214254 "Add initial prototype for the GN meta-buildsystem."
>
> It broke the check_licenses step on Android (see http://build.chromium.org/p/chromium.linux/builders/Android%20Builder%20%28dbg%29/builds/39904/steps/check_licenses/logs/stdio):
>
> @@@BUILD_STEP check_licenses@@@
> > /b/build/slave/Android_Builder__dbg_/build/src/android_webview/tools/webview_licenses.py scan
> Got LicenseError "missing README.chromium or licenses.py SPECIAL_CASES entry" while scanning tools/gn/secondary/base/third_party/dynamic_annotations
> Got LicenseError "missing README.chromium or licenses.py SPECIAL_CASES entry" while scanning tools/gn/secondary/third_party/modp_b64
> < /b/build/slave/Android_Builder__dbg_/build/src/android_webview/tools/webview_licenses.py scan
> ERROR: process exited with code 2
> @@@STEP_FAILURE@@@
>
>
> > Add initial prototype for the GN meta-buildsystem.
> >
> > This is currently not hooked into the build. To build, add a reference to the
> > gn.gyp file to build/all.gyp
> >
> > R=darin@chromium.org, scottmg@chromium.org
> >
> > Review URL: https://codereview.chromium.org/21114002
>
> TBR=brettw@chromium.org
>
> Review URL: https://codereview.chromium.org/21084010
TBR=bauerb@chromium.org
Review URL: https://codereview.chromium.org/21204003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214333 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn/settings.cc')
-rw-r--r-- | tools/gn/settings.cc | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/tools/gn/settings.cc b/tools/gn/settings.cc new file mode 100644 index 0000000..82014a7 --- /dev/null +++ b/tools/gn/settings.cc @@ -0,0 +1,38 @@ +// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "tools/gn/settings.h" + +#include "base/logging.h" +#include "tools/gn/filesystem_utils.h" + +Settings::Settings(const BuildSettings* build_settings, + const Toolchain* toolchain, + const std::string& output_subdir_name) + : build_settings_(build_settings), + toolchain_(toolchain), + target_os_(WIN), // FIXME(brettw) set this properly. + import_manager_(), + base_config_(this) { + DCHECK(output_subdir_name.find('/') == std::string::npos); + if (output_subdir_name.empty()) { + toolchain_output_dir_ = build_settings->build_dir(); + } else { + // We guarantee this ends in a slash. + toolchain_output_subdir_.value().append(output_subdir_name); + toolchain_output_subdir_.value().push_back('/'); + + toolchain_output_dir_ = SourceDir(build_settings->build_dir().value() + + toolchain_output_subdir_.value()); + } + // The output dir will be null in some tests and when invoked to parsed + // one-off data without doing generation. + if (!toolchain_output_dir_.is_null()) + toolchain_gen_dir_ = SourceDir(toolchain_output_dir_.value() + "gen/"); +} + +Settings::~Settings() { +} + + |