summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-08 12:55:49 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-08 12:55:49 +0000
commit653bd5f03ef74274adbec816df10cdfd046b6eea (patch)
treec96f3829422d2fec66cb3a5bc00995bbba914110 /webkit
parent74484851bb8f9f1954014a08c81305e74f9b0bda (diff)
downloadchromium_src-653bd5f03ef74274adbec816df10cdfd046b6eea.zip
chromium_src-653bd5f03ef74274adbec816df10cdfd046b6eea.tar.gz
chromium_src-653bd5f03ef74274adbec816df10cdfd046b6eea.tar.bz2
Basic underpinnings of the gyp equivalent of the Linux SHARED=1 build:
parameterize the 'type' setting of the various library targets, with a default of 'static_library'. (Hat tip to Craig Schlenter.) Review URL: http://codereview.chromium.org/62127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/activex_shim/activex_shim.gyp2
-rw-r--r--webkit/default_plugin/default_plugin.gyp2
-rw-r--r--webkit/tools/test_shell/test_shell.gyp2
-rw-r--r--webkit/webkit.gyp10
4 files changed, 8 insertions, 8 deletions
diff --git a/webkit/activex_shim/activex_shim.gyp b/webkit/activex_shim/activex_shim.gyp
index 8addf20..7f08aaf 100644
--- a/webkit/activex_shim/activex_shim.gyp
+++ b/webkit/activex_shim/activex_shim.gyp
@@ -14,7 +14,7 @@
'targets': [
{
'target_name': 'activex_shim',
- 'type': 'static_library',
+ 'type': '<(library)',
'msvs_guid': 'F4F4BCAA-EA59-445C-A119-3E6C29647A51',
'dependencies': [
'../../base/base.gyp:base',
diff --git a/webkit/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp
index 926623c..55142b8 100644
--- a/webkit/default_plugin/default_plugin.gyp
+++ b/webkit/default_plugin/default_plugin.gyp
@@ -13,7 +13,7 @@
'targets': [
{
'target_name': 'default_plugin',
- 'type': 'static_library',
+ 'type': '<(library)',
'dependencies': [
'../../third_party/libxml/libxml.gyp:libxml',
'../../third_party/icu38/icu38.gyp:icui18n',
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 024512b..a9197e8 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -12,7 +12,7 @@
'targets': [
{
'target_name': 'test_shell_common',
- 'type': 'static_library',
+ 'type': '<(library)',
'dependencies': [
'../../../base/base.gyp:base',
'../../../base/base.gyp:base_gfx',
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 6727436..2f6f12b 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -200,7 +200,7 @@
},
{
'target_name': 'wtf',
- 'type': 'static_library',
+ 'type': '<(library)',
'dependencies': [
'config',
'../third_party/icu38/icu38.gyp:icui18n',
@@ -362,7 +362,7 @@
},
{
'target_name': 'pcre',
- 'type': 'static_library',
+ 'type': '<(library)',
'dependencies': [
'config',
'wtf',
@@ -404,7 +404,7 @@
},
{
'target_name': 'webcore',
- 'type': 'static_library',
+ 'type': '<(library)',
'dependencies': [
'config',
'pcre',
@@ -4090,7 +4090,7 @@
},
{
'target_name': 'webkit',
- 'type': 'static_library',
+ 'type': '<(library)',
'dependencies': [
'webcore',
],
@@ -4216,7 +4216,7 @@
},
{
'target_name': 'glue',
- 'type': 'static_library',
+ 'type': '<(library)',
'dependencies': [
'webcore',
'webkit',