diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 05:55:58 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 05:55:58 +0000 |
| commit | 0c32bac85f886491e61c3d7f031fa78a50e03729 (patch) | |
| tree | c06f5c7172a98929092c9564b616e39b1410441f /chrome | |
| parent | 8a810d9876bff1cee4f67b48efb406a8fafdd21a (diff) | |
| download | chromium_src-0c32bac85f886491e61c3d7f031fa78a50e03729.zip chromium_src-0c32bac85f886491e61c3d7f031fa78a50e03729.tar.gz chromium_src-0c32bac85f886491e61c3d7f031fa78a50e03729.tar.bz2 | |
Revert 108976 (broke win shared) - enable component build for content
R=jam@chromium.org
BUG=90442
TEST=
Review URL: http://codereview.chromium.org/8343068
TBR=dpranke@chromium.org
Review URL: http://codereview.chromium.org/8496006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -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 |
4 files changed, 2 insertions, 42 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': { |