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

89 files changed, 157 insertions, 160 deletions

diff --git a/app/app_base.gypi b/app/app_base.gypi
index a52e391..c1c2669 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -47,7 +47,7 @@
   'targets': [
     {
       'target_name': 'app_base',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '4631946D-7D5F-44BD-A5A8-504C0A7033BE',
       'variables': {
         'app_base_target': 1,
@@ -324,7 +324,7 @@
       'targets': [
         {
           'target_name': 'app_base_nacl_win64',
-          'type': '<(library)',
+          'type': 'static_library',
           'msvs_guid': '4987C6F9-B230-48E5-BF91-418EAE69AD90',
           'dependencies': [
             # app resources and ui_strings should be shared with the 32-bit
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index 1e96171..4e613a9 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -10,7 +10,7 @@
   'targets': [
     {
       'target_name': 'allocator',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': 'C564F145-9172-42C3-BFCB-60FDEA124321',
       'include_dirs': [
         '.',
diff --git a/base/base.gyp b/base/base.gyp
index 68974f5..d10a4f2 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -12,7 +12,7 @@
   'targets': [
     {
       'target_name': 'base_i18n',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '968F3222-9798-4D21-BE08-15ECB5EF2994',
       'dependencies': [
         'base',
@@ -60,7 +60,7 @@
       # dynamic library. Note that this library cannot depend on base because
       # base depends on base_static.
       'target_name': 'base_static',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         'base_switches.cc',
         'base_switches.h',
@@ -75,7 +75,7 @@
       # TODO(rvargas): Remove this when gyp finally supports a clean model.
       # See bug 36232.
       'target_name': 'base_static_win64',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         'base_switches.cc',
         'base_switches.h',
@@ -293,7 +293,7 @@
     },
     {
       'target_name': 'test_support_base',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'base',
         'base_static',
@@ -335,7 +335,7 @@
     },
     {
       'target_name': 'test_support_perf',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'base',
         '../testing/gtest.gyp:gtest',
diff --git a/base/base.gypi b/base/base.gypi
index def5b0cf6..b89ff65 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -604,7 +604,7 @@
       'targets': [
         {
           'target_name': 'base_nacl_win64',
-          'type': '<(library)',
+          'type': 'static_library',
           'msvs_guid': 'CEE1F794-DC70-4FED-B7C4-4C12986672FE',
           'variables': {
             'base_target': 1,
@@ -638,7 +638,7 @@
       'targets': [
         {
           'target_name': 'symbolize',
-          'type': '<(library)',
+          'type': 'static_library',
           'variables': {
             'chromium_code': 0,
           },
@@ -663,7 +663,7 @@
         },
         {
           'target_name': 'xdg_mime',
-          'type': '<(library)',
+          'type': 'static_library',
           'variables': {
             'chromium_code': 0,
           },
diff --git a/base/third_party/dynamic_annotations/dynamic_annotations.gyp b/base/third_party/dynamic_annotations/dynamic_annotations.gyp
index d1fa819..18796e1 100644
--- a/base/third_party/dynamic_annotations/dynamic_annotations.gyp
+++ b/base/third_party/dynamic_annotations/dynamic_annotations.gyp
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'dynamic_annotations',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': 'EF3AD1A1-5FA6-4B70-9CCC-F5AE4C6D0892',
       'include_dirs': [
         '../../../',
@@ -22,7 +22,7 @@
       'targets': [
         {
           'target_name': 'dynamic_annotations_win64',
-          'type': '<(library)',
+          'type': 'static_library',
           'msvs_guid': 'E8055455-0065-427B-9461-34A16FAD1973',
           # We can't use dynamic_annotations target for win64 build since it is
           # a 32-bit library.
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp
index 4713f4d..fb01fa7 100644
--- a/breakpad/breakpad.gyp
+++ b/breakpad/breakpad.gyp
@@ -25,7 +25,7 @@
       'targets': [
         {
           'target_name': 'breakpad_utilities',
-          'type': '<(library)',
+          'type': 'static_library',
           'sources': [
             'src/common/convert_UTF.c',
             'src/client/mac/handler/breakpad_nlist_64.cc',
@@ -174,7 +174,7 @@
         },
         {
           'target_name': 'breakpad',
-          'type': '<(library)',
+          'type': 'static_library',
           'dependencies': [
             'breakpad_utilities',
             'crash_inspector',
@@ -283,7 +283,7 @@
       'targets': [
         {
           'target_name': 'breakpad_client',
-          'type': '<(library)',
+          'type': 'static_library',
 
           'sources': [
             'src/client/linux/crash_generation/crash_generation_client.cc',
@@ -338,7 +338,7 @@
         {
           # Breakpad r693 uses some files from src/processor in unit tests.
           'target_name': 'breakpad_processor_support',
-          'type': '<(library)',
+          'type': 'static_library',
 
           'sources': [
             'src/processor/basic_code_modules.cc',
diff --git a/breakpad/breakpad_handler.gypi b/breakpad/breakpad_handler.gypi
index 5d20542..521939b 100644
--- a/breakpad/breakpad_handler.gypi
+++ b/breakpad/breakpad_handler.gypi
@@ -36,7 +36,7 @@
       'targets': [
         {
           'target_name': 'breakpad_handler',
-          'type': '<(library)',
+          'type': 'static_library',
           'variables': {
             'breakpad_handler_target': 1,
           },
@@ -58,7 +58,7 @@
           # BREAKPAD_NO_TERMINATE_THREAD as that define makes breakpad crash
           # when created and destroyed in DllMain.
           'target_name': 'breakpad_handler_dll',
-          'type': '<(library)',
+          'type': 'static_library',
           'variables': {
             'breakpad_handler_target': 1,
           },
@@ -72,7 +72,7 @@
         },
         {
           'target_name': 'breakpad_handler_win64',
-          'type': '<(library)',
+          'type': 'static_library',
           'variables': {
             'breakpad_handler_target': 1,
           },
diff --git a/breakpad/breakpad_sender.gypi b/breakpad/breakpad_sender.gypi
index a6d4664..b50bddc 100644
--- a/breakpad/breakpad_sender.gypi
+++ b/breakpad/breakpad_sender.gypi
@@ -26,7 +26,7 @@
       'targets': [
         {
           'target_name': 'breakpad_sender',
-          'type': '<(library)',
+          'type': 'static_library',
           'msvs_guid': '9946A048-043B-4F8F-9E07-9297B204714C',
           'variables': {
             'breakpad_sender_target': 1,
@@ -41,7 +41,7 @@
         },
         {
           'target_name': 'breakpad_sender_win64',
-          'type': '<(library)',
+          'type': 'static_library',
           'msvs_guid': '237AEB58-9D74-41EF-9D49-A6ECE24EA8BC',
           'variables': {
             'breakpad_sender_target': 1,
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)',
diff --git a/chrome/app/policy/cloud_policy_codegen.gyp b/chrome/app/policy/cloud_policy_codegen.gyp
index a65308c..5a37d63 100644
--- a/chrome/app/policy/cloud_policy_codegen.gyp
+++ b/chrome/app/policy/cloud_policy_codegen.gyp
@@ -137,7 +137,7 @@
     },
     {
       'target_name': 'policy',
-      'type': '<(library)',
+      'type': 'static_library',
       'hard_dependency': 1,
       'direct_dependent_settings': {
         'include_dirs': [
@@ -174,7 +174,7 @@
       'targets': [
         {
           'target_name': 'policy_win64',
-          'type': '<(library)',
+          'type': 'static_library',
           'hard_dependency': 1,
           'sources': [
             '<(policy_constant_header_path)',
diff --git a/chrome/browser/sync/protocol/sync_proto.gyp b/chrome/browser/sync/protocol/sync_proto.gyp
index f505f41..fcaa032 100644
--- a/chrome/browser/sync/protocol/sync_proto.gyp
+++ b/chrome/browser/sync/protocol/sync_proto.gyp
@@ -56,7 +56,7 @@
     },
     {
       'target_name': 'sync_proto_cpp',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.cc',
         '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.h',
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 57ef9a1..fa1c008 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -416,7 +416,7 @@
     },
     {
       'target_name': 'debugger',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '57823D8C-A317-4713-9125-2C91FDFD12D6',
       'dependencies': [
         'chrome_extra_resources',
@@ -477,7 +477,7 @@
     },
     {
       'target_name': 'utility',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7',
       'dependencies': [
         '../base/base.gyp:base',
@@ -501,7 +501,7 @@
     },
     {
       'target_name': 'profile_import',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
       ],
@@ -515,7 +515,7 @@
       # Provides a syncapi dynamic library target from checked-in binaries,
       # or from compiling a stub implementation.
       'target_name': 'syncapi',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         'browser/sync/engine/http_post_provider_factory.h',
         'browser/sync/engine/http_post_provider_interface.h',
@@ -553,7 +553,7 @@
     },
     {
       'target_name': 'sync',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         'browser/sync/engine/all_status.cc',
         'browser/sync/engine/all_status.h',
@@ -740,7 +740,7 @@
     # A library for sending and receiving server-issued notifications.
     {
       'target_name': 'sync_notifier',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         'browser/sync/notifier/cache_invalidation_packet_handler.cc',
         'browser/sync/notifier/cache_invalidation_packet_handler.h',
@@ -782,7 +782,7 @@
     },
     {
       'target_name': 'service',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '2DA87614-55C5-4E56-A17E-0CD099786197',
       'dependencies': [
         'chrome_strings',
@@ -1469,7 +1469,7 @@
         },
         {
           'target_name': 'automation',
-          'type': '<(library)',
+          'type': 'static_library',
           'msvs_guid': '1556EF78-C7E6-43C8-951F-F6B43AC0DD12',
           'dependencies': [
             'theme_resources',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 524ecc4..dee86f8 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'browser',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
       'dependencies': [
         'app/policy/cloud_policy_codegen.gyp:policy',
@@ -4549,7 +4549,7 @@
     },
     {
       'target_name': 'in_memory_url_index_cache_proto_cpp',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         '<(protoc_out_dir)/chrome/browser/history/in_memory_url_index_cache.pb.cc',
         '<(protoc_out_dir)/chrome/browser/history/in_memory_url_index_cache.pb.h',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index a5d80c0..458168d 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -85,7 +85,7 @@
   'targets': [
     {
       'target_name': 'common',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '899F1280-3441-4D1F-BA04-CCD6208D9146',
       'variables': {
         'chrome_common_target': 1,
@@ -350,7 +350,7 @@
     },
     {
       'target_name': 'common_net',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         'common/net/http_return.h',
         'common/net/net_resource_provider.cc',
@@ -473,7 +473,7 @@
       'targets': [
         {
           'target_name': 'common_nacl_win64',
-          'type': '<(library)',
+          'type': 'static_library',
           'msvs_guid': '3AB5C5E9-470C-419B-A0AE-C7381FB632FA',
           'variables': {
             'chrome_common_target': 1,
diff --git a/chrome/chrome_installer_util.gypi b/chrome/chrome_installer_util.gypi
index 08384e76..7e045d9 100644
--- a/chrome/chrome_installer_util.gypi
+++ b/chrome/chrome_installer_util.gypi
@@ -87,7 +87,7 @@
       'targets': [
         {
           'target_name': 'installer_util',
-          'type': '<(library)',
+          'type': 'static_library',
           'msvs_guid': 'EFBB1436-A63F-4CD8-9E99-B89226E782EC',
           'variables': {
             'installer_util_target': 1,
@@ -141,7 +141,7 @@
         },
         {
           'target_name': 'installer_util_nacl_win64',
-          'type': '<(library)',
+          'type': 'static_library',
           'msvs_guid': '91016F29-C324-4236-8AA0-032765E71582',
           'variables': {
             'installer_util_target': 1,
@@ -169,7 +169,7 @@
       'targets': [
         {
           'target_name': 'installer_util',
-          'type': '<(library)',
+          'type': 'static_library',
           'dependencies': [
             'common_constants',
             'chrome_resources',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 88cdb2d..90fea9c 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'renderer',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '9301A569-5D2B-4D11-9332-B1E30AEACB8D',
       'dependencies': [
         'common',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 933d313..6a8992c 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -21,7 +21,7 @@
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'browser',
         'common',
@@ -223,7 +223,7 @@
     },
     {
       'target_name': 'test_support_ui',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'test_support_common',
         'chrome_resources',
@@ -272,7 +272,7 @@
     },
     {
       'target_name': 'test_support_sync',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gmock.gyp:gmock',
@@ -297,7 +297,7 @@
     },
     {
       'target_name': 'test_support_syncapi',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         'syncapi',
@@ -318,7 +318,7 @@
     },
     {
       'target_name': 'test_support_sync_notifier',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '../testing/gmock.gyp:gmock',
         'sync_notifier',
@@ -333,7 +333,7 @@
     },
     {
       'target_name': 'test_support_unit',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'test_support_common',
         'chrome_resources',
@@ -770,7 +770,7 @@
       # The documention of the protocol implemented is at:
       # http://code.google.com/p/selenium/wiki/JsonWireProtocol
       'target_name': 'chromedriver_lib',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'browser',
         'chrome',
diff --git a/chrome/common_constants.gypi b/chrome/common_constants.gypi
index eb9c87d..179c25f 100644
--- a/chrome/common_constants.gypi
+++ b/chrome/common_constants.gypi
@@ -55,7 +55,7 @@
   'targets': [
     {
       'target_name': 'common_constants',
-      'type': '<(library)',
+      'type': 'static_library',
       'variables': {
         'common_constants_target': 1,
       },
@@ -74,7 +74,7 @@
       'targets': [
         {
           'target_name': 'common_constants_win64',
-          'type': '<(library)',
+          'type': 'static_library',
           'variables': {
             'common_constants_target': 1,
           },
diff --git a/chrome/default_plugin/default_plugin.gyp b/chrome/default_plugin/default_plugin.gyp
index 0a53ac1..f16bd8b 100644
--- a/chrome/default_plugin/default_plugin.gyp
+++ b/chrome/default_plugin/default_plugin.gyp
@@ -9,7 +9,7 @@
   'targets': [
     {
       'target_name': 'default_plugin',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         ':default_plugin_resources',
         '<(DEPTH)/base/base.gyp:base',
diff --git a/chrome/installer/mac/third_party/xz/xz.gyp b/chrome/installer/mac/third_party/xz/xz.gyp
index c71cfa5..4ee21d3 100644
--- a/chrome/installer/mac/third_party/xz/xz.gyp
+++ b/chrome/installer/mac/third_party/xz/xz.gyp
@@ -260,7 +260,7 @@
   'targets': [
     {
       'target_name': 'lzma',
-      'type': '<(library)',
+      'type': 'static_library',
       'defines': [
         '<@(lzma_common_defines)',
         '<@(lzma_decompress_defines)',
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi
index 84da264..031147d 100644
--- a/chrome/nacl.gypi
+++ b/chrome/nacl.gypi
@@ -53,9 +53,6 @@
   'targets': [
     {
       'target_name': 'nacl',
-      # The TLS (Thread Local Storage) access used by NaCl on x86-64
-      # on Linux/ELF can't be linked into a shared library, so we
-      # can't use '<(library)' here.  See http://crbug.com/35829.
       'type': 'static_library',
       'msvs_guid': '83E86DAF-5763-4711-AD34-5FDAE395560C',
       'variables': {
@@ -97,7 +94,7 @@
       'targets': [
         {
           'target_name': 'nacl_win64',
-          'type': '<(library)',
+          'type': 'static_library',
           'msvs_guid': '14135464-9FB9-42E3-99D8-791116FA1204',
           'variables': {
             'nacl_target': 1,
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 93d09bd..6d13ab6 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'content_browser',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'content_common',
         '../app/app.gyp:app_resources',
diff --git a/content/content_common.gypi b/content/content_common.gypi
index ebc0e25..33e2578 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'content_common',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../ipc/ipc.gyp:ipc',
diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi
index fea5677f..b5f9dfc 100644
--- a/content/content_gpu.gypi
+++ b/content/content_gpu.gypi
@@ -9,7 +9,7 @@
   'targets': [
     {
       'target_name': 'content_gpu',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': 'F10F1ECD-D84D-4C33-8468-9DDFE19F4D8A',
       'dependencies': [
         'content_common',
diff --git a/content/content_plugin.gypi b/content/content_plugin.gypi
index 93c0ca9..7b533b5 100644
--- a/content/content_plugin.gypi
+++ b/content/content_plugin.gypi
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'content_plugin',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '20A560A0-2CD0-4D9E-A58B-1F24B99C087A',
       'dependencies': [
         'content_common',
diff --git a/content/content_ppapi_plugin.gypi b/content/content_ppapi_plugin.gypi
index 6dc13d3..64eb124 100644
--- a/content/content_ppapi_plugin.gypi
+++ b/content/content_ppapi_plugin.gypi
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'content_ppapi_plugin',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../ppapi/ppapi_internal.gyp:ppapi_proxy',
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 6798011..4dd51c2 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -7,7 +7,7 @@
     {
       'target_name': 'content_renderer',
       'msvs_guid': '9AAA8CF2-9B3D-4895-8CB9-D70BBD125EAD',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'content_common',
         '../jingle/jingle.gyp:jingle_glue',
diff --git a/content/content_worker.gypi b/content/content_worker.gypi
index fa1d504..498315f 100644
--- a/content/content_worker.gypi
+++ b/content/content_worker.gypi
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'content_worker',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': 'C78D02D0-A366-4EC6-A248-AA8E64C4BA18',
       'dependencies': [
         'content_common',
diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp
index 55a19dd..69965b3 100644
--- a/courgette/courgette.gyp
+++ b/courgette/courgette.gyp
@@ -44,7 +44,7 @@
   'targets': [
     {
       'target_name': 'courgette_lib',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk',
@@ -149,7 +149,7 @@
       'targets': [
         {
           'target_name': 'courgette_lib64',
-          'type': '<(library)',
+          'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base_nacl_win64',
             '../third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk64',
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp
index f6bb591a..88863a1 100644
--- a/crypto/crypto.gyp
+++ b/crypto/crypto.gyp
@@ -10,7 +10,7 @@
     {
       'target_name': 'crypto',
       'product_name': 'crcrypto',  # Avoid colliding with OpenSSL's libcrypto
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
       ],
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index f6c7820..76b13fc28 100644
--- a/ipc/ipc.gyp
+++ b/ipc/ipc.gyp
@@ -76,7 +76,7 @@
     },
     {
       'target_name': 'test_support_ipc',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'ipc',
         '../base/base.gyp:base',
diff --git a/ipc/ipc.gypi b/ipc/ipc.gypi
index 3ee4970..4ccf993 100644
--- a/ipc/ipc.gypi
+++ b/ipc/ipc.gypi
@@ -55,7 +55,7 @@
   'targets': [
     {
       'target_name': 'ipc',
-      'type': '<(library)',
+      'type': 'static_library',
       'variables': {
         'ipc_target': 1,
       },
@@ -77,7 +77,7 @@
       'targets': [
         {
           'target_name': 'ipc_win64',
-          'type': '<(library)',
+          'type': 'static_library',
           'variables': {
             'ipc_target': 1,
           },
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
index c796210..8db3011 100644
--- a/jingle/jingle.gyp
+++ b/jingle/jingle.gyp
@@ -10,7 +10,7 @@
     # A library of various utils for integration with libjingle.
     {
       'target_name': 'jingle_glue',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         'glue/channel_socket_adapter.cc',
         'glue/channel_socket_adapter.h',
@@ -37,7 +37,7 @@
     # its own library.
     {
       'target_name': 'notifier',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         'notifier/base/chrome_async_socket.cc',
         'notifier/base/chrome_async_socket.h',
@@ -119,7 +119,7 @@
     },
     {
       'target_name': 'notifier_test_util',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         'notifier/base/fake_base_task.cc',
         'notifier/base/fake_base_task.h',
@@ -132,7 +132,7 @@
     },
     {
       'target_name': 'jingle_glue_test_util',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         'glue/fake_network_manager.cc',
         'glue/fake_network_manager.h',
diff --git a/media/media.gyp b/media/media.gyp
index c61e8c2..9b6b195 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -10,7 +10,7 @@
   'targets': [
     {
       'target_name': 'media',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'yuv_convert',
         '../base/base.gyp:base',
@@ -256,7 +256,7 @@
     },
     {
       'target_name': 'cpu_features',
-      'type': '<(library)',
+      'type': 'static_library',
       'include_dirs': [
         '..',
       ],
@@ -278,7 +278,7 @@
     },
     {
       'target_name': 'yuv_convert',
-      'type': '<(library)',
+      'type': 'static_library',
       'include_dirs': [
         '..',
       ],
@@ -305,7 +305,7 @@
     },
     {
       'target_name': 'yuv_convert_sse2',
-      'type': '<(library)',
+      'type': 'static_library',
       'include_dirs': [
         '..',
       ],
@@ -445,7 +445,7 @@
     },
     {
       'target_name': 'media_test_support',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'media',
         '../base/base.gyp:base',
@@ -710,7 +710,7 @@
         },
         {
           'target_name': 'omx_wrapper',
-          'type': '<(library)',
+          'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../third_party/openmax/openmax.gyp:il',
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',
diff --git a/printing/printing.gyp b/printing/printing.gyp
index e3cafd2..aae1a6e 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -9,7 +9,7 @@
   'targets': [
     {
       'target_name': 'printing',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '../app/app.gyp:app_base',  # Only required for Font support
         '../base/base.gyp:base',
diff --git a/remoting/proto/chromotocol.gyp b/remoting/proto/chromotocol.gyp
index 705af2d..7a0faf2 100644
--- a/remoting/proto/chromotocol.gyp
+++ b/remoting/proto/chromotocol.gyp
@@ -54,7 +54,7 @@
 
     {
       'target_name': 'chromotocol_proto_lib',
-      'type': '<(library)',
+      'type': 'static_library',
       'export_dependent_settings': [
         '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
         'chromotocol_proto',
diff --git a/remoting/proto/trace.gyp b/remoting/proto/trace.gyp
index a417a5b..e75f28d 100644
--- a/remoting/proto/trace.gyp
+++ b/remoting/proto/trace.gyp
@@ -48,7 +48,7 @@
 
     {
       'target_name': 'trace_proto_lib',
-      'type': '<(library)',
+      'type': 'static_library',
       'export_dependent_settings': [
         '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
         'trace_proto',
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 83a78d0..e616fbc 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -214,7 +214,7 @@
     }, # end of target 'webapp_me2mom'
     {
       'target_name': 'remoting_base',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../ui/ui.gyp:ui_gfx',
@@ -287,7 +287,7 @@
 
     {
       'target_name': 'remoting_host',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'remoting_base',
         'remoting_jingle_glue',
@@ -378,7 +378,7 @@
 
     {
       'target_name': 'remoting_client',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'remoting_base',
         'remoting_jingle_glue',
@@ -440,7 +440,7 @@
 
     {
       'target_name': 'remoting_jingle_glue',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../jingle/jingle.gyp:jingle_glue',
@@ -473,7 +473,7 @@
 
     {
       'target_name': 'remoting_protocol',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'remoting_base',
         'remoting_jingle_glue',
@@ -549,7 +549,7 @@
 
     {
       'target_name': 'differ_block',
-      'type': '<(library)',
+      'type': 'static_library',
       'include_dirs': [
         '..',
       ],
@@ -571,7 +571,7 @@
 
     {
       'target_name': 'differ_block_sse2',
-      'type': '<(library)',
+      'type': 'static_library',
       'include_dirs': [
         '..',
       ],
diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp
index 22d88ac..9078337 100644
--- a/sandbox/sandbox.gyp
+++ b/sandbox/sandbox.gyp
@@ -157,7 +157,7 @@
         },
         {
           'target_name': 'sandbox',
-          'type': '<(library)',
+          'type': 'static_library',
           'conditions': [
             ['target_arch!="arm"', {
                'dependencies': [
@@ -181,7 +181,7 @@
       'targets': [
         {
           'target_name': 'sandbox',
-          'type': '<(library)',
+          'type': 'static_library',
           'variables': {
             'sandbox_windows_target': 1,
           },
@@ -231,7 +231,7 @@
         },
         {
           'target_name': 'sandbox_win64',
-          'type': '<(library)',
+          'type': 'static_library',
           'variables': {
             'sandbox_windows_target': 1,
           },
diff --git a/sdch/sdch.gyp b/sdch/sdch.gyp
index 42d1f81..6f1ed68 100644
--- a/sdch/sdch.gyp
+++ b/sdch/sdch.gyp
@@ -9,7 +9,7 @@
   'targets': [
     {
       'target_name': 'sdch',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': 'F54ABC59-5C00-414A-A9BA-BAF26D1699F0',
       'sources': [
         'open-vcdiff/src/addrcache.cc',
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 403a1a2..0e203ed 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -879,7 +879,7 @@
     # separately as well.
     {
       'target_name': 'skia_opts',
-      'type': '<(library)',
+      'type': 'static_library',
       'include_dirs': [
         '..',
         'config',
diff --git a/testing/gmock.gyp b/testing/gmock.gyp
index 8f73cb6..57ef913 100644
--- a/testing/gmock.gyp
+++ b/testing/gmock.gyp
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'gmock',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': 'F9D886ED-B09F-4B74-932F-D8E4691E6B7F',
       'dependencies': [
         'gtest.gyp:gtest',
@@ -51,7 +51,7 @@
     },
     {
       'target_name': 'gmock_main',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'gmock',
       ],
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index 1a91ac5..c3116f1 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'gtest',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': 'BFE8E2A7-3B3B-43B0-A994-3058B852DB8B',
       'sources': [
         'gtest/include/gtest/gtest-death-test.h',
@@ -123,7 +123,7 @@
     },
     {
       'target_name': 'gtest_main',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'gtest',
       ],
diff --git a/third_party/bspatch/bspatch.gyp b/third_party/bspatch/bspatch.gyp
index bc519c4..b511aed 100644
--- a/third_party/bspatch/bspatch.gyp
+++ b/third_party/bspatch/bspatch.gyp
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'bspatch',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': 'D7ED06E8-6138-4CE3-A906-5EF1D9C804E0',
       'dependencies': [
         '../lzma_sdk/lzma_sdk.gyp:lzma_sdk',
diff --git a/third_party/bzip2/bzip2.gyp b/third_party/bzip2/bzip2.gyp
index 27f5c84..b1548f9 100644
--- a/third_party/bzip2/bzip2.gyp
+++ b/third_party/bzip2/bzip2.gyp
@@ -18,7 +18,7 @@
       'targets': [
         {
           'target_name': 'bzip2',
-          'type': '<(library)',
+          'type': 'static_library',
           'defines': ['BZ_NO_STDIO'],
           'msvs_guid': '2A70CBF0-847E-4E3A-B926-542A656DC7FE',
           'sources': [
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index c1e5497c..608b8f0 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -61,7 +61,7 @@
     # The C++ files generated from the cache invalidation protocol buffers.
     {
       'target_name': 'cacheinvalidation_proto_cpp',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         '<(protoc_out_dir)/<(proto_dir_relpath)/internal.pb.h',
         '<(protoc_out_dir)/<(proto_dir_relpath)/internal.pb.cc',
@@ -93,7 +93,7 @@
     # only on this.
     {
       'target_name': 'cacheinvalidation',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         'overrides/google/cacheinvalidation/callback.h',
         'overrides/google/cacheinvalidation/compiler-specific.h',
diff --git a/third_party/cld/cld.gyp b/third_party/cld/cld.gyp
index c553a84..8b12a0f 100644
--- a/third_party/cld/cld.gyp
+++ b/third_party/cld/cld.gyp
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'cld',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
       	'../icu/icu.gyp:icuuc',
       ],
diff --git a/third_party/expat/expat.gyp b/third_party/expat/expat.gyp
index 2f5b9bf..2d956e2 100644
--- a/third_party/expat/expat.gyp
+++ b/third_party/expat/expat.gyp
@@ -33,7 +33,7 @@
       'targets': [
         {
           'target_name': 'expat',
-          'type': '<(library)',
+          'type': 'static_library',
           'sources': [
             'files/lib/expat.h',
             'files/lib/xmlparse.c',
diff --git a/third_party/harfbuzz-ng/harfbuzz.gyp b/third_party/harfbuzz-ng/harfbuzz.gyp
index 08bbb14..907d445 100644
--- a/third_party/harfbuzz-ng/harfbuzz.gyp
+++ b/third_party/harfbuzz-ng/harfbuzz.gyp
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'harfbuzz',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         'src/hb-blob-private.h',
         'src/hb-blob.c',
diff --git a/third_party/harfbuzz/harfbuzz.gyp b/third_party/harfbuzz/harfbuzz.gyp
index 64535be..c1e829f 100644
--- a/third_party/harfbuzz/harfbuzz.gyp
+++ b/third_party/harfbuzz/harfbuzz.gyp
@@ -8,7 +8,7 @@
       'targets': [
         {
           'target_name': 'harfbuzz',
-          'type': '<(library)',
+          'type': 'static_library',
           'sources': [
             'contrib/harfbuzz-freetype.c',
             'contrib/harfbuzz-unicode.c',
diff --git a/third_party/iaccessible2/iaccessible2.gyp b/third_party/iaccessible2/iaccessible2.gyp
index 70e92b1..cf984a7 100644
--- a/third_party/iaccessible2/iaccessible2.gyp
+++ b/third_party/iaccessible2/iaccessible2.gyp
@@ -16,7 +16,7 @@
   'targets': [
     {
       'target_name': 'iaccessible2',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': 'C974E070-3787-490A-87B0-E333B06CA1E2',
       'sources': [
         'ia2_api_all.idl',
diff --git a/third_party/iccjpeg/iccjpeg.gyp b/third_party/iccjpeg/iccjpeg.gyp
index ee79527..d27af1d 100644
--- a/third_party/iccjpeg/iccjpeg.gyp
+++ b/third_party/iccjpeg/iccjpeg.gyp
@@ -7,7 +7,7 @@
     {
       'target_name': 'iccjpeg',
       'product_name': 'iccjpeg',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '<(libjpeg_gyp_path):libjpeg',
       ],
diff --git a/third_party/isimpledom/isimpledom.gyp b/third_party/isimpledom/isimpledom.gyp
index 92f88d8..76b94ac 100644
--- a/third_party/isimpledom/isimpledom.gyp
+++ b/third_party/isimpledom/isimpledom.gyp
@@ -16,7 +16,7 @@
   'targets': [
     {
       'target_name': 'isimpledom',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '1814CEEB-49E2-407F-AF99-FA755A7D2607',
       'sources': [
         'ISimpleDOMDocument.idl',
diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp
index 39a97d9..ab732a2 100644
--- a/third_party/libevent/libevent.gyp
+++ b/third_party/libevent/libevent.gyp
@@ -12,7 +12,7 @@
         {
           'target_name': 'libevent',
           'product_name': 'event',
-          'type': '<(library)',
+          'type': 'static_library',
           'sources': [
             'buffer.c',
             'evbuffer.c',
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index da50fdd..b78918d 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -131,7 +131,7 @@
   'targets': [
     {
       'target_name': 'libjingle',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         'overrides/talk/base/basictypes.h',
         'overrides/talk/base/constructormagic.h',
@@ -354,7 +354,7 @@
     # properly.
     {
       'target_name': 'libjingle_p2p',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         'source/talk/p2p/base/candidate.h',
         'source/talk/p2p/base/common.h',
diff --git a/third_party/libjpeg/libjpeg.gyp b/third_party/libjpeg/libjpeg.gyp
index 731a61c..e0f4f1d 100644
--- a/third_party/libjpeg/libjpeg.gyp
+++ b/third_party/libjpeg/libjpeg.gyp
@@ -18,7 +18,7 @@
       'targets': [
         {
           'target_name': 'libjpeg',
-          'type': '<(library)',
+          'type': 'static_library',
           'msvs_guid': '238CE175-76CE-4A25-A676-69D115885601',
           'sources': [
             'jcapimin.c',
diff --git a/third_party/libphonenumber/libphonenumber.gyp b/third_party/libphonenumber/libphonenumber.gyp
index 0fdfcc5..c0e26b6 100644
--- a/third_party/libphonenumber/libphonenumber.gyp
+++ b/third_party/libphonenumber/libphonenumber.gyp
@@ -30,7 +30,7 @@
   },
   'targets': [{
     'target_name': 'libphonenumber',
-    'type': '<(library)',
+    'type': 'static_library',
     'dependencies': [
       '../icu/icu.gyp:icui18n',
       '../icu/icu.gyp:icuuc',
diff --git a/third_party/libwebp/libwebp.gyp b/third_party/libwebp/libwebp.gyp
index a43f79d..51826da 100644
--- a/third_party/libwebp/libwebp.gyp
+++ b/third_party/libwebp/libwebp.gyp
@@ -11,7 +11,7 @@
       'targets': [
         {
           'target_name': 'libwebp_enc',
-          'type': '<(library)',
+          'type': 'static_library',
           'include_dirs': ['.'],
           'sources': [
             'enc/analysis.c',
@@ -31,7 +31,7 @@
         },
         {
           'target_name': 'libwebp_dec',
-          'type': '<(library)',
+          'type': 'static_library',
           'include_dirs': ['.'],
           'sources': [
             'dec/bits.c',
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp
index de0d329..2a1a6c8 100644
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -39,7 +39,7 @@
             ],
           },
         }, { # else: OS != "linux" or ! use_system_libxml
-          'type': '<(library)',
+          'type': 'static_library',
           'msvs_guid': 'F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7',
           'sources': [
             'linux/config.h',
diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp
index f18f810..826bf5ec 100644
--- a/third_party/libxslt/libxslt.gyp
+++ b/third_party/libxslt/libxslt.gyp
@@ -38,7 +38,7 @@
             ],
           },
         }, { # else: OS != "linux" or ! use_system_libxml
-          'type': '<(library)',
+          'type': 'static_library',
           'msvs_guid': 'FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED',
           'sources': [
             'libxslt/attributes.c',
diff --git a/third_party/lzma_sdk/lzma_sdk.gyp b/third_party/lzma_sdk/lzma_sdk.gyp
index 518a257..f29bb7c 100644
--- a/third_party/lzma_sdk/lzma_sdk.gyp
+++ b/third_party/lzma_sdk/lzma_sdk.gyp
@@ -37,7 +37,7 @@
   'targets': [
     {
       'target_name': 'lzma_sdk',
-      'type': '<(library)',
+      'type': 'static_library',
       'defines': [
         '_LZMA_PROB32',
         '_LZMA_IN_CB',
@@ -65,7 +65,7 @@
       'targets': [
         {
           'target_name': 'lzma_sdk64',
-          'type': '<(library)',
+          'type': 'static_library',
           'defines': [
             '_LZMA_PROB32',
             '_LZMA_IN_CB',
diff --git a/third_party/mach_override/mach_override.gyp b/third_party/mach_override/mach_override.gyp
index 3dbb1d1..fa61591 100644
--- a/third_party/mach_override/mach_override.gyp
+++ b/third_party/mach_override/mach_override.gyp
@@ -10,7 +10,7 @@
       'targets' : [
         {
           'target_name' : 'mach_override',
-          'type': '<(library)',
+          'type': 'static_library',
           'sources': [
             'mach_override.c',
             'mach_override.h',
diff --git a/third_party/modp_b64/modp_b64.gyp b/third_party/modp_b64/modp_b64.gyp
index 4ed34f4..1c346e0 100644
--- a/third_party/modp_b64/modp_b64.gyp
+++ b/third_party/modp_b64/modp_b64.gyp
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'modp_b64',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '7100F41F-868D-4E99-80A2-AF8E6574749D',
       'sources': [
         'modp_b64.cc',
diff --git a/third_party/ocmock/ocmock.gyp b/third_party/ocmock/ocmock.gyp
index 077d7d0..f0a000d 100644
--- a/third_party/ocmock/ocmock.gyp
+++ b/third_party/ocmock/ocmock.gyp
@@ -10,7 +10,7 @@
       'targets' : [
         {
           'target_name' : 'ocmock',
-          'type': '<(library)',
+          'type': 'static_library',
           'include_dirs': [ '.', '../..', ],
           'direct_dependent_settings': {
             'include_dirs': [ '.', ],
diff --git a/third_party/openmax/openmax.gyp b/third_party/openmax/openmax.gyp
index 50fb184..acf863b 100644
--- a/third_party/openmax/openmax.gyp
+++ b/third_party/openmax/openmax.gyp
@@ -32,7 +32,7 @@
       },
       'conditions': [
         ['OS!="linux"', {
-          'type': '<(library)',
+          'type': 'static_library',
           'dependencies': [
             '../../base/base.gyp:base',
           ],
@@ -59,7 +59,7 @@
             'intermediate_dir': '<(INTERMEDIATE_DIR)',
             'output_root': '<(SHARED_INTERMEDIATE_DIR)/openmax',
            },
-          'type': '<(library)',
+          'type': 'static_library',
           'dependencies': [
             '../../base/base.gyp:base',
           ],
diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp
index c104f2d..6978150 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -37,7 +37,7 @@
     # to your .proto file.
     {
       'target_name': 'protobuf_lite',
-      'type': '<(library)',
+      'type': 'static_library',
       'toolsets': ['host', 'target'],
       'sources': [
         'src/google/protobuf/stubs/common.h',
@@ -97,7 +97,7 @@
     # DO NOT LINK AGAINST THIS TARGET IN CHROME CODE  --agl
     {
       'target_name': 'protobuf_full_do_not_use',
-      'type': '<(library)',
+      'type': 'static_library',
       'toolsets': ['host','target'],
       'sources': [
         'src/google/protobuf/descriptor.h',
diff --git a/third_party/qcms/qcms.gyp b/third_party/qcms/qcms.gyp
index 7d9cdef..b8bd079 100644
--- a/third_party/qcms/qcms.gyp
+++ b/third_party/qcms/qcms.gyp
@@ -7,7 +7,7 @@
     {
       'target_name': 'qcms',
       'product_name': 'qcms',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         'qcms.h',
         'qcmsint.h',
diff --git a/third_party/snappy/snappy.gyp b/third_party/snappy/snappy.gyp
index 6f8b28c..e24dc88 100644
--- a/third_party/snappy/snappy.gyp
+++ b/third_party/snappy/snappy.gyp
@@ -18,7 +18,7 @@
   'targets': [
     {
       'target_name': 'snappy',
-      'type': '<(library)',
+      'type': 'static_library',
       'include_dirs': [
         '<(os_include)',
         'src',
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index 1f50f5e..1ce4346 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -66,7 +66,7 @@
           },
         }, { # else: OS != "linux" or ! use_system_sqlite
           'product_name': 'sqlite3',
-          'type': '<(library)',
+          'type': 'static_library',
           'msvs_guid': '6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9',
           'sources': [
             'amalgamation/sqlite3.h',
diff --git a/third_party/undoview/undoview.gyp b/third_party/undoview/undoview.gyp
index 430a321..424ffcb 100644
--- a/third_party/undoview/undoview.gyp
+++ b/third_party/undoview/undoview.gyp
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'undoview',
-      'type': '<(library)',
+      'type': 'static_library',
       'sources': [
         'undo_manager.h',
         'undo_manager.c',
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
index 0f77cb0..6fa9e9d 100644
--- a/third_party/zlib/zlib.gyp
+++ b/third_party/zlib/zlib.gyp
@@ -20,7 +20,7 @@
       'targets': [
         {
           'target_name': 'zlib',
-          'type': '<(library)',
+          'type': 'static_library',
           'msvs_guid': '8423AF0D-4B88-4EBF-94E1-E4D00D00E21C',
           'sources': [
             'contrib/minizip/ioapi.c',
@@ -79,7 +79,7 @@
       'targets': [
         {
           'target_name': 'zlib',
-          'type': '<(library)',
+          'type': 'static_library',
           'direct_dependent_settings': {
             'defines': [
               'USE_SYSTEM_ZLIB',
diff --git a/ui/gfx/compositor/compositor.gyp b/ui/gfx/compositor/compositor.gyp
index 8a6f66a..bc81e04 100644
--- a/ui/gfx/compositor/compositor.gyp
+++ b/ui/gfx/compositor/compositor.gyp
@@ -19,7 +19,7 @@
   'targets': [
     {
       'target_name': 'compositor',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '21CEE0E3-6F4E-4F01-B8C9-F7751CC21AA9',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
diff --git a/ui/gfx/gl/gl.gyp b/ui/gfx/gl/gl.gyp
index da520bd..8af8563 100644
--- a/ui/gfx/gl/gl.gyp
+++ b/ui/gfx/gl/gl.gyp
@@ -34,7 +34,7 @@
   'targets': [
     {
       'target_name': 'gl',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/app/app.gyp:app_base',
         '<(DEPTH)/base/base.gyp:base',
diff --git a/ui/gfx/surface/surface.gyp b/ui/gfx/surface/surface.gyp
index 19aa1ba..4eeb024 100644
--- a/ui/gfx/surface/surface.gyp
+++ b/ui/gfx/surface/surface.gyp
@@ -36,7 +36,7 @@
   'targets': [
     {
       'target_name': 'surface',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '6C99567D-6F02-43B5-BB35-D8E3F8D0D6D2',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
diff --git a/ui/ui_base.gypi b/ui/ui_base.gypi
index 1f20b43..9facff0 100644
--- a/ui/ui_base.gypi
+++ b/ui/ui_base.gypi
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'ui_base',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
diff --git a/ui/ui_gfx.gypi b/ui/ui_gfx.gypi
index 04c0d88..8c5672d 100644
--- a/ui/ui_gfx.gypi
+++ b/ui/ui_gfx.gypi
@@ -38,7 +38,7 @@
     },
     {
       'target_name': 'ui_gfx',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '13A8D36C-0467-4B4E-BAA3-FD69C45F076A',
       'dependencies': [
         '../base/base.gyp:base',
diff --git a/ui/ui_views.gypi b/ui/ui_views.gypi
index b291bd4..77cb335 100644
--- a/ui/ui_views.gypi
+++ b/ui/ui_views.gypi
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'v2',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '70760ECA-4D8B-47A4-ACDC-D3E7F25F0543',
       'dependencies': [
         '../skia/skia.gyp:skia',
diff --git a/views/views.gyp b/views/views.gyp
index 01937a1..8f86b11 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -59,7 +59,7 @@
   'targets': [
     {
       'target_name': 'views',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '6F9258E5-294F-47B2-919D-17FFE7A8B751',
       'dependencies': [
         '../app/app.gyp:app_base',
diff --git a/webkit/appcache/webkit_appcache.gypi b/webkit/appcache/webkit_appcache.gypi
index 3d8e857..6078a21 100644
--- a/webkit/appcache/webkit_appcache.gypi
+++ b/webkit/appcache/webkit_appcache.gypi
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'appcache',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '0B945915-31A7-4A07-A5B5-568D737A39B1',
       'dependencies': [
         '<(DEPTH)/app/app.gyp:app_base',
diff --git a/webkit/blob/webkit_blob.gypi b/webkit/blob/webkit_blob.gypi
index 18a353a..418bb76 100644
--- a/webkit/blob/webkit_blob.gypi
+++ b/webkit/blob/webkit_blob.gypi
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'blob',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '02567509-F7CA-4E84-8524-4F72DA2D3111',
       'dependencies': [
         '<(DEPTH)/app/app.gyp:app_base',
diff --git a/webkit/database/webkit_database.gypi b/webkit/database/webkit_database.gypi
index 11c30f5..1f81d1c 100644
--- a/webkit/database/webkit_database.gypi
+++ b/webkit/database/webkit_database.gypi
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'database',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '1DA00DDD-44E5-4C56-B2CC-414FB0164492',
       'dependencies': [
         '<(DEPTH)/app/app.gyp:app_base',
diff --git a/webkit/fileapi/webkit_fileapi.gypi b/webkit/fileapi/webkit_fileapi.gypi
index 02be478..fc0c748 100644
--- a/webkit/fileapi/webkit_fileapi.gypi
+++ b/webkit/fileapi/webkit_fileapi.gypi
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'fileapi',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '40B53211-03ED-4932-8D53-52B172599DFE',
       'dependencies': [
         '<(DEPTH)/app/app.gyp:app_base',
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 16b7197..37eb77a 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -58,7 +58,7 @@
     },
     {
       'target_name': 'webkit_user_agent',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': 'DB162DE1-7D56-4C4A-8A9F-80D396CD7AA8',
       'dependencies': [
         '<(DEPTH)/app/app.gyp:app_base',
@@ -102,7 +102,7 @@
     },
     {
       'target_name': 'glue',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': 'C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09',
       'dependencies': [
         '<(DEPTH)/app/app.gyp:app_base',
diff --git a/webkit/gpu/webkit_gpu.gypi b/webkit/gpu/webkit_gpu.gypi
index 2e4a9d7..e15f28a 100644
--- a/webkit/gpu/webkit_gpu.gypi
+++ b/webkit/gpu/webkit_gpu.gypi
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'webkit_gpu',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/third_party/angle/src/build_angle.gyp:translator_common',
diff --git a/webkit/quota/webkit_quota.gypi b/webkit/quota/webkit_quota.gypi
index 101daf7..3ce7982 100644
--- a/webkit/quota/webkit_quota.gypi
+++ b/webkit/quota/webkit_quota.gypi
@@ -6,7 +6,7 @@
   'targets': [
     {
       'target_name': 'quota',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': '36A9AAD2-10DD-42CF-BF51-3CC79D26FCB4',
       'dependencies': [
         '<(DEPTH)/app/app.gyp:app_base',
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index bc46f95..047c686 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -9,7 +9,7 @@
   'targets': [
     {
       'target_name': 'webkit_support',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/ui/ui.gyp:ui_gfx',
@@ -72,7 +72,7 @@
 
     {
       'target_name': 'webkit_support_common',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/crypto/crypto.gyp:crypto',
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index 82cbdab..1d66da5 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -23,7 +23,7 @@
   'targets': [
     {
       'target_name': 'test_shell_common',
-      'type': '<(library)',
+      'type': 'static_library',
       'variables': {
         'chromium_code': 1,
       },