diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-07 20:17:16 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-07 20:17:16 +0000 |
| commit | 2ed04ae3a8f4b00808b2bd4a8c9e32befb4ecb84 (patch) | |
| tree | 96b133744df9c2b16f50f91901d70b84e5bb2c75 /tools/gn/variables.h | |
| parent | 66ab87e8ebc518ab54238f9899f813311844997b (diff) | |
| download | chromium_src-2ed04ae3a8f4b00808b2bd4a8c9e32befb4ecb84.zip chromium_src-2ed04ae3a8f4b00808b2bd4a8c9e32befb4ecb84.tar.gz chromium_src-2ed04ae3a8f4b00808b2bd4a8c9e32befb4ecb84.tar.bz2 | |
Add inherited libs and lib_dirs to GN.
The libs and lib_dirs are pushed up the tree until they reach a shared library or executable. Additionally, I added prefixes in the toolchain to specify these.
This converts ldflags to be per-target rather than inherited which was previously used to implement this feature.
Rename includes to include_dirs for consistency with lib_dirs.
Remove the sill swap_in_* inline functions and just do foo().swap().
BUG=
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/26074002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227328 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn/variables.h')
| -rw-r--r-- | tools/gn/variables.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/tools/gn/variables.h b/tools/gn/variables.h index 703ebde..2e8d0b4 100644 --- a/tools/gn/variables.h +++ b/tools/gn/variables.h @@ -131,14 +131,22 @@ extern const char kHardDep[]; extern const char kHardDep_HelpShort[]; extern const char kHardDep_Help[]; -extern const char kIncludes[]; -extern const char kIncludes_HelpShort[]; -extern const char kIncludes_Help[]; +extern const char kIncludeDirs[]; +extern const char kIncludeDirs_HelpShort[]; +extern const char kIncludeDirs_Help[]; extern const char kLdflags[]; extern const char kLdflags_HelpShort[]; extern const char kLdflags_Help[]; +extern const char kLibDirs[]; +extern const char kLibDirs_HelpShort[]; +extern const char kLibDirs_Help[]; + +extern const char kLibs[]; +extern const char kLibs_HelpShort[]; +extern const char kLibs_Help[]; + extern const char kOutputName[]; extern const char kOutputName_HelpShort[]; extern const char kOutputName_Help[]; |