Revert of Add a GN flag for the Windows multi-dll build. (patchset #3 …

…id:40001 of https://codereview.chromium.org/1120803003/) Reason for revert: May have caused some link errors on windows: https://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN/builds/814 Original issue's description: > Add a GN flag for the Windows multi-dll build. > > The first pass of moving the other Chrome-specific build flags out of the root build config file and into the new one. This requires both ffmpeg and Blink changes to finish landing. > > R=scottmg@chromium.org > TBR=ddorwin@chromium.org (widevine) > > Committed: https://crrev.com/edff53a35780ba2f515c7e8d4f7131c91151e1a3 > Cr-Commit-Position: refs/heads/master@{#327854} TBR=scottmg@chromium.org,brettw@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1117063004 Cr-Commit-Position: refs/heads/master@{#327861}
FairyWorld · May 1, 2015 · e203954 · e203954
1 parent 6573fb1
commit e203954
Show file tree

Hide file tree

Showing 31 changed files with 26 additions and 136 deletions.
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/allocator.gni")
-import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")

diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
@@ -66,13 +66,11 @@ declare_args() {
   # Selects the desired build flavor. Official builds get additional
   # processing to prepare for release. Normally you will want to develop and
   # test with this flag off.
-  # TODO(brettw) move to chrome_build.gni when DEPS are updated.
   is_official_build = false
 
   # Select the desired branding flavor. False means normal Chromium branding,
   # true means official Google Chrome branding (requires extra Google-internal
   # resources).
-  # TODO(brettw) move to chrome_build.gni when DEPS are updated.
   is_chrome_branded = false
 
   # Compile for Address Sanitizer to find memory bugs.

diff --git a/build/config/chrome_build.gni b/build/config/chrome_build.gni
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
-import("//build/config/chrome_build.gni")
 if (current_cpu == "arm") {
   import("//build/config/arm.gni")
 }

diff --git a/build/config/features.gni b/build/config/features.gni
@@ -11,7 +11,6 @@
 #
 # See also build/config/ui.gni
 
-import("//build/config/chrome_build.gni")
 if (is_android) {
   import("//build/config/android/config.gni")
 }

diff --git a/build/config/mac/mac_sdk.gni b/build/config/mac/mac_sdk.gni
@@ -2,8 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/chrome_build.gni")
-
 declare_args() {
   # Minimum supported version of the Mac SDK.
   mac_sdk_min = "10.6"

diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni
@@ -5,8 +5,6 @@
 # This header file defines the "sysroot" variable which is the absolute path
 # of the sysroot. If no sysroot applies, the variable will be an empty string.
 
-import("//build/config/chrome_build.gni")
-
 declare_args() {
   # The absolute path of the sysroot that is applied when compiling using
   # the target toolchain.

diff --git a/build/secondary/tools/grit/grit_rule.gni b/build/secondary/tools/grit/grit_rule.gni
@@ -75,7 +75,6 @@
 #     # You can also put deps here if the grit source depends on generated
 #     # files.
 #   }
-import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/chrome_build.gni")
 import("//build/config/features.gni")
 import("//build/config/locales.gni")
 import("//build/config/ui.gni")
@@ -25,14 +24,15 @@ if (!is_android) {
     ]
     defines = []
     deps = []
-    data_deps = []
+    datadeps = []
 
     # TODO(GYP) mac_bundle_resources, xcode_settings
 
     # TODO(GYP) order_profiling, order_text_section
 
     if (is_win) {
       sources += [
+        "$target_gen_dir/chrome_exe_version.rc",
         "//content/app/startup_helper_win.cc",
         "//content/public/common/content_switches.cc",
         "app/chrome_crash_reporter_client.cc",
@@ -145,22 +145,17 @@ if (!is_android) {
         "//third_party/adobe/flash:flapper_binaries",
         "//third_party/widevine/cdm:widevinecdmadapter",
       ]
+      # TODO(GYP) some stuff from GYP including chrome_multiple_dll.
     }
 
     if (is_linux && enable_plugins) {
       deps += [ "//pdf" ]
     }
-
-    if (is_multi_dll_chrome) {
-      defines += [ "CHROME_MULTIPLE_DLL" ]
-      data_deps += [ ":chrome_child" ]
-    }
   }
 }  # !is_android
 
 shared_library("main_dll") {
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
-  defines = []
 
   deps = [
     ":browser_dependencies",
@@ -219,7 +214,8 @@ shared_library("main_dll") {
     deps += [ "//ui/compositor" ]
   }
 
-  if (is_multi_dll_chrome) {
+  #TODO(GYP) add chrome_multiple_dll support
+  if (false) {  #chrome_multiple_dll) {
     defines += [ "CHROME_MULTIPLE_DLL_BROWSER" ]
     deps += [ "//content/public/app:browser" ]
   } else {
@@ -240,55 +236,11 @@ shared_library("main_dll") {
     # TODO(GYP) Lots of other stuff in the OS=="mac" block.
   }
 
-  if (enable_plugins && !is_multi_dll_chrome) {
+  if (enable_plugins) {
     deps += [ "//pdf" ]
   }
 }
 
-if (is_multi_dll_chrome) {
-  shared_library("chrome_child") {
-    sources = [
-      "app/chrome_main.cc",
-      "app/chrome_main_delegate.cc",
-      "app/chrome_main_delegate.h",
-      "app/close_handle_hook_win.cc",
-      "app/close_handle_hook_win.h",
-    ]
-
-    configs += [ "//build/config/compiler:wexit_time_destructors" ]
-    defines = [ "CHROME_MULTIPLE_DLL_CHILD" ]
-
-    deps = [
-      ":child_dependencies",
-      ":chrome_dll_version",
-      "//chrome/browser/policy:path_parser",
-      "//content/public/app:child",
-    ]
-
-    if (is_win) {
-      deps += [ "//chrome_elf" ]
-      # TODO(GYP): PGO on Windows.
-      # ['chrome_pgo_phase==1', {
-      #   'msvs_settings': {
-      #     'VCLinkerTool': {
-      #       'LinkTimeCodeGeneration': '2',
-      #     },
-      #   },
-      # }],
-      # ['chrome_pgo_phase==2', {
-      #   'msvs_settings': {
-      #     'VCLinkerTool': {
-      #       'LinkTimeCodeGeneration': '3',
-      #     },
-      #   },
-      # }],
-    }
-    if (enable_plugins) {
-      deps += [ "//pdf" ]
-    }
-  }
-}
-
 # GYP version: chromium_browser_dependencies variable in chrome.gyp
 group("browser_dependencies") {
   deps = [

diff --git a/chrome/app/resources/BUILD.gn b/chrome/app/resources/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/chrome_build.gni")
 import("//tools/grit/grit_rule.gni")
 
 # GYP version: chrome/chrome_resources.gyp:chrome_strings

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")

diff --git a/chrome/browser/policy/BUILD.gn b/chrome/browser/policy/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("path_parser") {
+static_library("path_parser") {
   sources = [
     "policy_path_parser.h",
     "policy_path_parser_linux.cc",

diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
@@ -326,7 +326,6 @@
     ['chrome_multiple_dll', {
       'targets': [
         {
-          # GN version: //chrome:chrome_child
           'target_name': 'chrome_child_dll',
           'type': 'shared_library',
           'product_name': 'chrome_child',

diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/chrome_build.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//tools/grit/repack.gni")

diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
@@ -277,6 +277,7 @@ static_library("constants") {
     "widevine_cdm_constants.cc",
     "widevine_cdm_constants.h",
   ]
+  sources += get_target_outputs(":make_chrome_version")
 
   deps = [
     ":make_chrome_version",

diff --git a/chrome/installer/util/BUILD.gn b/chrome/installer/util/BUILD.gn
@@ -2,8 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/chrome_build.gni")
-
 static_library("util") {
   deps = [
     "//base",

diff --git a/chrome/policy.gypi b/chrome/policy.gypi
@@ -5,7 +5,6 @@
 {
   'targets': [
     {
-      # GN version: //chrome/browser/policy:path_parser
       'target_name': 'policy_path_parser',
       'type': 'static_library',
       'dependencies': [

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")

diff --git a/chrome/version.gni b/chrome/version.gni
@@ -2,15 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/chrome_build.gni")
-
 # Runs the version processing script over the given template file to produce
 # an output file. This is used for generating various forms of files that
 # incorporate the product name and version.
 #
-# Unlike GYP, this will actually compile the resulting file, so you don't need
-# to add it separately to the sources, just depend on the target.
-#
 # This template automatically includes VERSION, LASTCHANGE, and BRANDING. It
 # automatically uses the template file .
 # GYP parameterizes this template file but all current invocations use this
@@ -55,11 +50,10 @@ template("process_version") {
          "Either sources or template_file must be defined for $target_name")
   assert(defined(invoker.output), "Output must be defined for $target_name")
 
-  action_name = target_name + "_action"
-  source_set_name = target_name
-
-  action(action_name) {
-    visibility = [ ":$source_set_name" ]
+  action(target_name) {
+    if (defined(invoker.visibility)) {
+      visibility = invoker.visibility
+    }
     script = "//build/util/version.py"
 
     lastchange_path = "//build/util/LASTCHANGE"
@@ -114,14 +108,4 @@ template("process_version") {
       rebase_path(invoker.output, root_build_dir),
     ]
   }
-
-  source_set(source_set_name) {
-    if (defined(invoker.visibility)) {
-      visibility = invoker.visibility
-    }
-    sources = get_target_outputs(":$action_name")
-    deps = [
-      ":$action_name",
-    ]
-  }
 }
diff --git a/chrome_elf/BUILD.gn b/chrome_elf/BUILD.gn
@@ -14,6 +14,7 @@ process_version("chrome_elf_resources") {
 
 shared_library("chrome_elf") {
   sources = [
+    "$target_gen_dir/chrome_elf_version.rc",
     "chrome_elf_main.cc",
     "chrome_elf_main.h",
   ]

diff --git a/components/policy/BUILD.gn b/components/policy/BUILD.gn
@@ -2,9 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/chrome_build.gni")
 import("//build/config/features.gni")
-import("//components/policy/resources/policy_templates.gni")
+import("resources/policy_templates.gni")
 import("//third_party/protobuf/proto_library.gni")
 import("//tools/grit/grit_rule.gni")
 

diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
@@ -2,7 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/chrome_build.gni")
+# TODO(GYP) enable chrome_multiple_dll support
+is_chrome_multiple_dll = false
 
 content_app_sources = [
   "android/app_jni_registrar.cc",
@@ -70,7 +71,7 @@ content_app_extra_configs = [
   "//content:content_implementation",
 ]
 
-if (!is_multi_dll_chrome) {
+if (!is_chrome_multiple_dll) {
   content_app_deps += [ "//content/gpu:gpu_sources" ]
 }
 
@@ -85,7 +86,7 @@ source_set("both") {
   deps = content_app_deps
 }
 
-if (is_multi_dll_chrome) {
+if (is_chrome_multiple_dll) {
   # It doesn't make sense to do the browser/child dll split in component mode.
   assert(!is_component_build)
 
@@ -96,7 +97,7 @@ if (is_multi_dll_chrome) {
     configs += content_app_extra_configs
     deps = content_app_deps
 
-    defines = [ "CHROME_MULTIPLE_DLL_BROWSER" ]
+    defines += [ "CHROME_MULTIPLE_DLL_BROWSER" ]
   }
 
   source_set("child") {
@@ -106,6 +107,6 @@ if (is_multi_dll_chrome) {
     configs += content_app_extra_configs
     deps = content_app_deps
 
-    defines = [ "CHROME_MULTIPLE_DLL_CHILD" ]
+    defines += [ "CHROME_MULTIPLE_DLL_CHILD" ]
   }
 }