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

28 files changed, 35 insertions, 35 deletions

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',