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
trevorlinton · May 19, 2011 · 5a54733 · 5a54733
1 parent ab03674
commit 5a54733
Show file tree

Hide file tree

Showing 89 changed files with 157 additions and 160 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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',