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

4 files changed, 11 insertions, 11 deletions

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.