From c06bc70a2606ed8be38c996672d22807afea9896 Mon Sep 17 00:00:00 2001 From: rickyz Date: Thu, 30 Apr 2015 18:45:00 -0700 Subject: [PATCH] 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-Original-Commit-Position: refs/heads/master@{#327861} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: e203954b33d80072a7c8d256ffdc69fa42262765 --- config/BUILD.gn | 1 - config/BUILDCONFIG.gn | 2 -- config/chrome_build.gni | 21 --------------------- config/compiler/BUILD.gn | 1 - config/features.gni | 1 - config/mac/mac_sdk.gni | 2 -- config/sysroot.gni | 2 -- secondary/tools/grit/grit_rule.gni | 1 - 8 files changed, 31 deletions(-) delete mode 100644 config/chrome_build.gni diff --git a/config/BUILD.gn b/config/BUILD.gn index 1bd666bd2..22cb45ab9 100644 --- a/config/BUILD.gn +++ b/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/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn index 2274c0e98..455ec0d3d 100644 --- a/config/BUILDCONFIG.gn +++ b/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/config/chrome_build.gni b/config/chrome_build.gni deleted file mode 100644 index 99e598ec1..000000000 --- a/config/chrome_build.gni +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2015 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -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 here from BUILDCONFIG.gn 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 here from BUILDCONFIG.gn when DEPS are updated. - #is_chrome_branded = false - - # Break chrome.dll into multple pieces based on process type. Only available - # on Windows. - is_multi_dll_chrome = is_win && !is_component_build -} diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn index 95e09d93c..c2171549f 100644 --- a/config/compiler/BUILD.gn +++ b/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/config/features.gni b/config/features.gni index 661170ecd..3f6377376 100644 --- a/config/features.gni +++ b/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/config/mac/mac_sdk.gni b/config/mac/mac_sdk.gni index 600085e8b..44995a3e6 100644 --- a/config/mac/mac_sdk.gni +++ b/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/config/sysroot.gni b/config/sysroot.gni index e5a9c2b20..057971d69 100644 --- a/config/sysroot.gni +++ b/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/secondary/tools/grit/grit_rule.gni b/secondary/tools/grit/grit_rule.gni index 35bbed327..09a04c1eb 100644 --- a/secondary/tools/grit/grit_rule.gni +++ b/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")