Commit dda803bd authored by brettw's avatar brettw Committed by Commit bot

De-duplicate BASE_IMPLEMENTATION define in the GN build.

TBR=ncbray

Review URL: https://codereview.chromium.org/1016443002

Cr-Commit-Position: refs/heads/master@{#320771}
parent 52f4caf6
......@@ -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) {
......
......@@ -55,7 +55,7 @@ source_set("debug") {
]
}
defines = [ "BASE_IMPLEMENTATION" ]
configs += [ "//base:base_implementation" ]
deps = [
"//base/memory",
......@@ -63,7 +63,7 @@ source_set("debug") {
]
if (is_linux) {
defines += [ "USE_SYMBOLIZE" ]
defines = [ "USE_SYMBOLIZE" ]
deps += [ "//base/third_party/symbolize" ]
}
......
......@@ -27,7 +27,7 @@ source_set("json") {
]
}
defines = [ "BASE_IMPLEMENTATION" ]
configs += [ "//base:base_implementation" ]
deps = [
"//base/memory",
......
......@@ -54,7 +54,7 @@ source_set("memory") {
sources -= [ "shared_memory_nacl.cc" ]
}
defines = [ "BASE_IMPLEMENTATION" ]
configs += [ "//base:base_implementation" ]
visibility = [ "//base/*" ]
}
......@@ -37,7 +37,7 @@ source_set("metrics") {
sources -= [ "field_trial.cc" ]
}
defines = [ "BASE_IMPLEMENTATION" ]
configs += [ "//base:base_implementation" ]
deps = [
"//base/debug",
......
......@@ -94,7 +94,7 @@ source_set("process") {
]
}
defines = [ "BASE_IMPLEMENTATION" ]
configs += [ "//base:base_implementation" ]
deps = [
"//base/memory",
......
......@@ -12,7 +12,7 @@ source_set("nspr") {
# In GYP this project is part of base, so it uses the base implementation
# define. TODO(brettw) rename this define.
defines = [ "BASE_IMPLEMENTATION" ]
configs += [ "//base:base_implementation" ]
if (is_android && !is_debug) {
configs -= [ "//build/config/compiler:optimize" ]
......
......@@ -41,7 +41,7 @@ source_set("trace_event") {
]
}
defines = [ "BASE_IMPLEMENTATION" ]
configs += [ "//base:base_implementation" ]
deps = [
"//base/debug",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment