reland 'Set chrome_multiple_dll=1 by default on Windows in static_lib…

…rary' Previously: https://codereview.chromium.org/22909017/ TBR=jam@chromium.org BUG=237249 Review URL: https://chromiumcodereview.appspot.com/23320004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218663 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Aug 21, 2013 · 45b7c52 · 45b7c52
1 parent 6504c08
commit 45b7c52
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/build/common.gypi b/build/common.gypi
@@ -1446,6 +1446,9 @@
           }],
           ['component=="shared_library"', {
             'win_use_allocator_shim%': 0,
+          },{
+            # Turn on multiple dll by default on Windows when in static_library.
+            'chrome_multiple_dll%': 1,
           }],
           ['component=="shared_library" and "<(GENERATOR)"=="ninja"', {
             # Only enabled by default for ninja because it's buggy in VS.

diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
@@ -744,9 +744,9 @@ int ChromeMainDelegate::RunProcess(
     const content::MainFunctionParams& main_function_params) {
   // ANDROID doesn't support "service", so no ServiceProcessMain, and arraysize
   // doesn't support empty array. So we comment out the block for Android.
-#if !defined(OS_ANDROID) && !defined(CHROME_MULTIPLE_DLL_CHILD)
+#if !defined(OS_ANDROID)
   static const MainFunction kMainFunctions[] = {
-#if defined(ENABLE_FULL_PRINTING)
+#if defined(ENABLE_FULL_PRINTING) && !defined(CHROME_MULTIPLE_DLL_CHILD)
     { switches::kServiceProcess,     ServiceProcessMain },
 #endif
 

diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi
@@ -19,6 +19,7 @@
         'chrome_android_auxiliary',
         'chromium_testshell_jni_headers',
         'chrome.gyp:browser_ui',
+        '../content/content.gyp:content_app_browser',
       ],
       'sources': [
         # This file must always be included in the shared_library step to ensure

diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
@@ -412,7 +412,7 @@
         '../chrome/chrome.gyp:renderer',
         '../chrome/chrome.gyp:test_support_common',
         '../chrome/chrome_resources.gyp:chrome_resources',
-        '../content/content.gyp:content_app_browser',
+        '../content/content.gyp:content_app_both',
         '../content/content.gyp:content_gpu',
         '../content/content.gyp:test_support_content',
         '../net/net.gyp:net',

diff --git a/content/content.gyp b/content/content.gyp
@@ -46,7 +46,6 @@
           'target_name': 'content',
           'type': 'none',
           'dependencies': [
-            'content_app_browser',
             'content_browser',
             'content_child',
             'content_common',