diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-29 21:06:26 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-29 21:06:26 +0000 |
commit | 0a79fe4b90ca24b1e5ac78f15991ac4017f68b9d (patch) | |
tree | b6b9c5d1f7cfc99f1a4278c46f6fdbfd9e709977 /tools/gn/copy_target_generator.cc | |
parent | f796b33367f47be55d51a3fd8a19bad6a48b744b (diff) | |
download | chromium_src-0a79fe4b90ca24b1e5ac78f15991ac4017f68b9d.zip chromium_src-0a79fe4b90ca24b1e5ac78f15991ac4017f68b9d.tar.gz chromium_src-0a79fe4b90ca24b1e5ac78f15991ac4017f68b9d.tar.bz2 |
Add a GYP command to GN. This runs GYP and then GN, and does some work to integrate the builds.
Adds an "external" variable that's set in the GYP mode of GN that will cause it to not write out a target but to pretend it's there. These are the ones that should be generated by GYP. This value is not used in the normal "gen" mode so we actually have two builds: a separate GN-only build that includes GN itself and some other low-level libraries, and a hybrid build.
This renames and moves some of the GN targets so that the names and locations match those of the GYP build.
I prefixed the ninja rules for the default toolchain to avoid colliding with the GYP ones. I also fixed some places where the rules were not getting prefixed.
I added an exception to target output labeling to avoid double-prefixing with "lib".
TBR=scottmg
BUG=
Review URL: https://codereview.chromium.org/23493013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn/copy_target_generator.cc')
-rw-r--r-- | tools/gn/copy_target_generator.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/gn/copy_target_generator.cc b/tools/gn/copy_target_generator.cc index 6347ca2..18ecc3f 100644 --- a/tools/gn/copy_target_generator.cc +++ b/tools/gn/copy_target_generator.cc @@ -22,6 +22,7 @@ CopyTargetGenerator::~CopyTargetGenerator() { void CopyTargetGenerator::DoRun() { target_->set_output_type(Target::COPY_FILES); + FillExternal(); FillSources(); FillDestDir(); |