Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2357)

Unified Diff: base/BUILD.gn

Issue 1016443002: De-duplicate BASE_IMPLEMENTATION define in the GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/debug/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index abba51bd9036c5997cee49c63ac64ce5b4c94dd6..f1034466a65dbb033103fd4743edf6b288509322 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -9,6 +9,10 @@ if (is_android) {
import("//build/config/android/rules.gni")
}
+config("base_implementation") {
+ defines = [ "BASE_IMPLEMENTATION" ]
+}
+
source_set("base_paths") {
sources = [
"base_paths.cc",
@@ -34,7 +38,7 @@ source_set("base_paths") {
]
}
- defines = [ "BASE_IMPLEMENTATION" ]
+ configs += [ ":base_implementation" ]
deps = [
"//base/memory",
@@ -607,7 +611,7 @@ component("base") {
"sys_info_openbsd.cc",
]
- defines = [ "BASE_IMPLEMENTATION" ]
+ configs += [ ":base_implementation" ]
deps = [
":base_static",
@@ -630,7 +634,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
if (is_mac || is_ios || is_chromeos) {
- defines += [ "SYSTEM_NATIVE_UTF8" ]
+ defines = [ "SYSTEM_NATIVE_UTF8" ]
}
if (is_android) {
@@ -1279,8 +1283,6 @@ test("base_unittests") {
"win/wrapped_window_proc_unittest.cc",
]
- defines = []
-
deps = [
":base",
":i18n",
@@ -1300,7 +1302,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
if (is_mac || is_ios || is_chromeos) {
- defines += [ "SYSTEM_NATIVE_UTF8" ]
+ defines = [ "SYSTEM_NATIVE_UTF8" ]
}
if (is_android) {
« no previous file with comments | « no previous file | base/debug/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698