summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 23:18:53 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 23:18:53 +0000
commit5a5473381495625fdf691f93be48497f4edf003d (patch)
tree71210a4a0d933a71bcaa0c25db7930af891cf1d8 /net
parentab0367457117bc9f408be8730074befa57f93e51 (diff)
downloadchromium_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 'net')
-rw-r--r--net/net.gyp8
-rw-r--r--net/third_party/nss/ssl.gyp2
2 files changed, 5 insertions, 5 deletions
diff --git a/net/net.gyp b/net/net.gyp
index 119d1c1..2ea9a94 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -9,7 +9,7 @@
'targets': [
{
'target_name': 'net',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
@@ -1127,7 +1127,7 @@
},
{
'target_name': 'net_test_support',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'net',
'../base/base.gyp:base',
@@ -1250,7 +1250,7 @@
},
{
'target_name': 'http_server',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'net',
'../base/base.gyp:base',
@@ -1360,7 +1360,7 @@
},
{
'target_name': 'curvecp',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
'net.gyp:net',
diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp
index 2f64565..562539e 100644
--- a/net/third_party/nss/ssl.gyp
+++ b/net/third_party/nss/ssl.gyp
@@ -23,7 +23,7 @@
{
'target_name': 'ssl',
'product_name': 'ssl',
- 'type': '<(library)',
+ 'type': 'static_library',
'sources': [
'ssl/authcert.c',
'ssl/cmpcert.c',