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

Unified Diff: base/BUILD.gn

Issue 987943002: Fix SysStrings unit test failure on Chromecast (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moving SYSTEM_NATIVE_UTF8 setup to base_unittest gyp target 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/base.gyp » ('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 25fc7c063e2280a9ef57d021feda7fdd2ffee030..b2d1280a972c009cc51f506a0531c1c7ba352c0a 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1419,6 +1419,8 @@ test("base_unittests") {
"win/wrapped_window_proc_unittest.cc",
]
+ defines = []
+
deps = [
":base",
":i18n",
@@ -1435,6 +1437,12 @@ test("base_unittests") {
"//third_party/icu",
]
+ # Allow more direct string conversions on platforms with native utf8
+ # strings
+ if (is_mac || is_ios || is_chromeos) {
+ defines += [ "SYSTEM_NATIVE_UTF8" ]
+ }
+
if (is_android) {
apk_deps = [
":base_java",
@@ -1469,7 +1477,7 @@ test("base_unittests") {
if (is_linux) {
sources -= [ "file_version_info_unittest.cc" ]
sources += [ "nix/xdg_util_unittest.cc" ]
- defines = [ "USE_SYMBOLIZE" ]
+ defines += [ "USE_SYMBOLIZE" ]
if (use_glib) {
configs += [ "//build/config/linux:glib" ]
}
« no previous file with comments | « no previous file | base/base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698