diff options
-rw-r--r-- | chrome/chrome_exe.gypi | 4 | ||||
-rw-r--r-- | chrome/chrome_installer_util.gypi | 19 | ||||
-rw-r--r-- | chrome/chrome_tests.gypi | 20 | ||||
-rw-r--r-- | chrome/nacl.gypi | 1 | ||||
-rw-r--r-- | content/common/content_export.h | 2 | ||||
-rw-r--r-- | content/content.gyp | 7 | ||||
-rw-r--r-- | webkit/appcache/appcache_export.h | 3 | ||||
-rw-r--r-- | webkit/appcache/webkit_appcache.gypi | 15 |
8 files changed, 11 insertions, 60 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index b5b1997..e19d4ea 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -495,9 +495,6 @@ 'app/client_util.cc', ], }], - ['OS=="win" and component=="shared_library"', { - 'defines': ['COMPILE_CONTENT_STATICALLY'], - }] ], }, ], @@ -537,7 +534,6 @@ ], 'defines': [ '<@(nacl_win64_defines)', - 'COMPILE_CONTENT_STATICALLY', ], 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/chrome', diff --git a/chrome/chrome_installer_util.gypi b/chrome/chrome_installer_util.gypi index fdb17d66..f6bbe07 100644 --- a/chrome/chrome_installer_util.gypi +++ b/chrome/chrome_installer_util.gypi @@ -97,13 +97,13 @@ }, 'dependencies': [ 'installer_util_strings', + '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', 'common_constants', 'chrome_resources.gyp:chrome_resources', 'chrome_resources.gyp:chrome_strings', + '../content/content.gyp:content_common', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', - '<(DEPTH)/content/content.gyp:content_common', '<(DEPTH)/courgette/courgette.gyp:courgette_lib', '<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch', '<(DEPTH)/third_party/icu/icu.gyp:icui18n', @@ -141,14 +141,6 @@ 'installer/util/shell_util.cc', 'installer/util/shell_util.h', ], - 'conditions': [ - ['component == "shared_library"', { - 'sources': [ '../content/public/common/content_switches.cc' ], - 'defines': [ 'COMPILE_CONTENT_STATICALLY'], - }, { - 'dependencies': ['<(DEPTH)/content/content.gyp:content_common'], - }], - ], }, { 'target_name': 'installer_util_nacl_win64', @@ -194,15 +186,8 @@ 'include_dirs': [ '<(DEPTH)', ], - 'conditions': [ - ['component == "shared_library"', { - 'sources': [ '../content/public/common/content_switches.cc' ], - 'defines': [ 'COMPILE_CONTENT_STATICALLY'], - }], - ], } ], }], - ], } diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 7403c54..c585f2a 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2320,16 +2320,6 @@ 'browser/printing/print_system_task_proxy_unittest.cc', ], }], - ['component == "shared_library"', { - # This is needed for tests that subclass - # RendererWebKitPlatformSupportImpl, which subclasses stuff in - # glue, which refers to symbols defined in these files. - # Hopefully this can be resolved with http://crbug.com/98755. - 'sources': [ - '../content/renderer/renderer_glue.cc', - '../content/common/socket_stream_dispatcher.cc', - ]}, - ], ], }, { @@ -2933,16 +2923,6 @@ '../webkit/webkit.gyp:copy_npapi_test_plugin', ], }], - ['component == "shared_library"', { - # This is needed for tests that subclass - # RendererWebKitPlatformSupportImpl, which subclasses stuff in - # glue, which refers to symbols defined in these files. - # Hopefully this can be resolved with http://crbug.com/98755. - 'sources': [ - '../content/renderer/renderer_glue.cc', - '../content/common/socket_stream_dispatcher.cc', - ]}, - ], ], # conditions }, # target browser_tests { diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index 8313b64..79225e2 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -178,7 +178,6 @@ ], 'defines': [ '<@(nacl_win64_defines)', - 'COMPILE_CONTENT_STATICALLY', ], 'configurations': { 'Common_Base': { diff --git a/content/common/content_export.h b/content/common/content_export.h index b39cdd5..fc91b72c 100644 --- a/content/common/content_export.h +++ b/content/common/content_export.h @@ -6,7 +6,7 @@ #define CONTENT_COMMON_CONTENT_EXPORT_H_ #pragma once -#if defined(COMPONENT_BUILD) && !defined(COMPILE_CONTENT_STATICALLY) +#if 0 // TODO(dpranke): Uncomment: defined(COMPONENT_BUILD). #if defined(WIN32) #if defined(CONTENT_IMPLEMENTATION) diff --git a/content/content.gyp b/content/content.gyp index 0e8fa51..be3f85c 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -22,11 +22,8 @@ # upstream unnecessarily (e.g., content_renderer depends on allocator # and chrome_exe depends on content_common but we don't want # chrome_exe to have to depend on allocator). - # - # TODO(dpranke): Remove the mac conditional once the circular - # dependencies in WebKit.gyp are fixed. - # See https://bugs.webkit.org/show_bug.cgi?id=68463 - ['OS == "mac" or component == "static_library"', { + # TODO(dpranke): Uncomment: ['component == "static_library"', { + ['1 == 1', { 'targets': [ {'target_name': 'content', 'type': 'none', diff --git a/webkit/appcache/appcache_export.h b/webkit/appcache/appcache_export.h index ece56ee..130816a 100644 --- a/webkit/appcache/appcache_export.h +++ b/webkit/appcache/appcache_export.h @@ -6,7 +6,8 @@ #define WEBKIT_APPCACHE_APPCACHE_EXPORT_H_ #pragma once -#if defined(COMPONENT_BUILD) +// TODO(dpranke): Uncomment to enable appcache component build. +#if 0 // defined(COMPONENT_BUILD) #if defined(WIN32) #if defined(APPCACHE_IMPLEMENTATION) diff --git a/webkit/appcache/webkit_appcache.gypi b/webkit/appcache/webkit_appcache.gypi index 724b0a0..1c7c13b 100644 --- a/webkit/appcache/webkit_appcache.gypi +++ b/webkit/appcache/webkit_appcache.gypi @@ -6,6 +6,9 @@ 'targets': [ { 'target_name': 'appcache', + # TODO(dpranke): Uncomment '<(component)', + # 'type': '<(component)', + 'type': 'static_library', 'defines': [ 'APPCACHE_IMPLEMENTATION', ], @@ -16,6 +19,7 @@ '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/sql/sql.gyp:sql', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + # TODO(dpranke): Uncomment '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'sources': [ # This list contains all .h and .cc in appcache except for test code. @@ -69,17 +73,6 @@ 'webkit_appcache.gypi', ], 'conditions': [ - [# TODO(dpranke): Remove once the circular dependencies in - # WebKit.gyp are fixed on the mac. - # See https://bugs.webkit.org/show_bug.cgi?id=68463 - 'OS=="mac"', { - 'type': 'static_library', - }, { - 'type': '<(component)', - 'dependencies': [ - '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', - ], - }], ['inside_chromium_build==0', { 'dependencies': [ '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', |