Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add brave_build.gni to avoid additional import statements in other gni files (#2708)

Browse Source 
fix https://github.com/brave/brave-browser/issues/4937
This commit is contained in:
Brian Johnson
2019-06-16 14:43:31 -07:00
committed by GitHub
parent 26436b7cc5
commit 463238baeb
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/config/brave_build.gni
+5
View File
@@ -0,0 +1,5 @@
# Add imports here for things that need to be available in chromium code.
# This file is included in most gn files either directly or through
# import("//build/config/chrome_build.gni") in compiler.gni
import("//brave/build/features.gni")
import("//brave/brave_repack_locales.gni")
patches/build-config-chrome_build.gni.patch
+2 -2
View File
@@ -1,12 +1,12 @@
diff --git a/build/config/chrome_build.gni b/build/config/chrome_build.gni
index 4bb4a043cbbcb562aed8926867660547cd7f018c..56179ead470be1b7a395302f3d274ee617dc98db 100644
index 4bb4a043cbbcb562aed8926867660547cd7f018c..5d31a9398c08843a212c1472114f31f4062d7d9f 100644
--- a/build/config/chrome_build.gni
+++ b/build/config/chrome_build.gni
@@ -1,6 +1,7 @@
# 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.
+import("//brave/build/features.gni")
+import("//brave/build/config/brave_build.gni")
declare_args() {
# Select the desired branding flavor. False means normal Chromium branding,
patches/chrome-chrome_repack_locales.gni.patch
+3 -11
View File
@@ -1,16 +1,8 @@
diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni
index dd37d98b467ec9bcf5ac5fd59ac56e43412a19fa..5a200e64670e4004041934eec9a23675de6d7e4d 100644
index dd37d98b467ec9bcf5ac5fd59ac56e43412a19fa..6500d8c648d260959cebc683ad29d9e9c3f9e9eb 100644
--- a/chrome/chrome_repack_locales.gni
+++ b/chrome/chrome_repack_locales.gni
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//brave/brave_repack_locales.gni")
import("//build/config/chrome_build.gni")
import("//build/config/features.gni")
import("//build/config/ui.gni")
@@ -35,6 +36,7 @@ template("chrome_repack_locales") {
@@ -35,6 +35,7 @@ template("chrome_repack_locales") {
"${root_gen_dir}/ui/strings/app_locale_settings_",
"${root_gen_dir}/ui/strings/ui_strings_",
]
@@ -18,7 +10,7 @@ index dd37d98b467ec9bcf5ac5fd59ac56e43412a19fa..5a200e64670e4004041934eec9a23675
if (!defined(deps)) {
deps = []
}
@@ -51,6 +53,7 @@ template("chrome_repack_locales") {
@@ -51,6 +52,7 @@ template("chrome_repack_locales") {
"//ui/strings:app_locale_settings",
"//ui/strings:ui_strings",
]