diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-08 21:30:34 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-08 21:30:34 +0000 |
| commit | 7ff2f5d2929d13bec977e4cd2cd5646413b2a592 (patch) | |
| tree | d4edd94a70647061bd05ce50dee01b5fb928e0cb /tools/gn/target.cc | |
| parent | 75ed8829d991b62b4943a29b0140d6803a70cac1 (diff) | |
| download | chromium_src-7ff2f5d2929d13bec977e4cd2cd5646413b2a592.zip chromium_src-7ff2f5d2929d13bec977e4cd2cd5646413b2a592.tar.gz chromium_src-7ff2f5d2929d13bec977e4cd2cd5646413b2a592.tar.bz2 | |
Add the concept of a source set to GN.
A source set acts like a static library in most cases, but doesn't actually make the library. The object files will be added to targets that depend on it.
I changed the default component mode to be a "source set" rather than a shared library in non-component mode.
This fixes the script target writer unit test on Windows.
BUG=
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/26267003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227596 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn/target.cc')
| -rw-r--r-- | tools/gn/target.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/gn/target.cc b/tools/gn/target.cc index ec35a05..a380156 100644 --- a/tools/gn/target.cc +++ b/tools/gn/target.cc @@ -188,7 +188,8 @@ void Target::PullDependentTargetInfo(std::set<const Config*>* unique_configs) { // Direct dependent libraries. if (dep->output_type() == STATIC_LIBRARY || - dep->output_type() == SHARED_LIBRARY) + dep->output_type() == SHARED_LIBRARY || + dep->output_type() == SOURCE_SET) inherited_libraries_.insert(dep); // Inherited libraries and flags are inherited across static library |