summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/config/BUILD.gn1
-rw-r--r--build/config/BUILDCONFIG.gn2
-rw-r--r--build/config/chrome_build.gni21
-rw-r--r--build/config/compiler/BUILD.gn1
-rw-r--r--build/config/features.gni1
-rw-r--r--build/config/mac/mac_sdk.gni2
-rw-r--r--build/config/sysroot.gni2
-rw-r--r--build/secondary/tools/grit/grit_rule.gni1
8 files changed, 0 insertions, 31 deletions
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
index 1bd666b..22cb45a 100644
--- 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
index 2274c0e..455ec0d 100644
--- 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
deleted file mode 100644
index 99e598e..0000000
--- a/build/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/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 95e09d9..c217154 100644
--- 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
index 661170e..3f63773 100644
--- 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
index 600085e..44995a3 100644
--- 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
index e5a9c2b..057971d 100644
--- 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
index 35bbed3..09a04c1 100644
--- 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")