summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/policy/cloud_policy_codegen.gyp4
-rw-r--r--chrome/browser/sync/protocol/sync_proto.gyp2
-rw-r--r--chrome/chrome.gyp16
-rw-r--r--chrome/chrome_browser.gypi4
-rw-r--r--chrome/chrome_common.gypi6
-rw-r--r--chrome/chrome_installer_util.gypi6
-rw-r--r--chrome/chrome_renderer.gypi2
-rw-r--r--chrome/chrome_tests.gypi14
-rw-r--r--chrome/common_constants.gypi4
-rw-r--r--chrome/default_plugin/default_plugin.gyp2
-rw-r--r--chrome/installer/mac/third_party/xz/xz.gyp2
-rw-r--r--chrome/nacl.gypi5
12 files changed, 32 insertions, 35 deletions
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,
generated by cgit v1.1 at 2025-01-31 16:16:48 +0000