diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 23:18:53 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 23:18:53 +0000 |
| commit | 5a5473381495625fdf691f93be48497f4edf003d (patch) | |
| tree | 71210a4a0d933a71bcaa0c25db7930af891cf1d8 /build | |
| parent | ab0367457117bc9f408be8730074befa57f93e51 (diff) | |
| download | chromium_src-5a5473381495625fdf691f93be48497f4edf003d.zip chromium_src-5a5473381495625fdf691f93be48497f4edf003d.tar.gz chromium_src-5a5473381495625fdf691f93be48497f4edf003d.tar.bz2 | |
Globally replace <(library) with static_library
We provided <(library) as a variable to support a peculiar
build configuration on Linux. We no longer support that build
configuration, so we can simplify this code to no longer use
a variable.
Review URL: http://codereview.chromium.org/7051014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index a5177f1..6c8d55e 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -62,7 +62,7 @@ 'chromeos%': '<(chromeos)', 'touchui%': '<(touchui)', 'host_arch%': '<(host_arch)', - 'library%': '<(library)', + 'library%': 'static_library', 'toolkit_views%': '<(toolkit_views)', # Override branding to select the desired branding flavor. @@ -117,7 +117,7 @@ # 'library' for static libraries. # By default, component is set to whatever library is set to and # it can be overriden by the GYP command line or by ~/.gyp/include.gypi. - 'component%': '<(library)', + 'component%': 'static_library', # Set to select the Title Case versions of strings in GRD files. 'use_titlecase_in_grd_files%': 0, @@ -217,7 +217,7 @@ 'arm_neon%': '<(arm_neon)', 'sysroot%': '<(sysroot)', 'disable_sse2%': '<(disable_sse2)', - 'library%': '<(library)', + 'library%': 'static_library', 'component%': '<(component)', 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)', 'use_third_party_translations%': '<(use_third_party_translations)', |