From 2ed04ae3a8f4b00808b2bd4a8c9e32befb4ecb84 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Mon, 7 Oct 2013 20:17:16 +0000 Subject: 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 --- tools/gn/variables.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'tools/gn/variables.h') 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[]; -- cgit v1.1