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

Unified Diff: base/base.gypi

Issue 987943002: Fix SysStrings unit test failure on Chromecast (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/test/BUILD.gn » ('j') | base/test/scoped_locale.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 0f8fff25736cac34b94541c18e8fb0594a357226..20d5e81950ed84d64808db098f0db7bf550de4b6 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -1007,11 +1007,6 @@
['OS == "win" and >(nacl_untrusted_build)==1', {
'sources/': [ ['exclude', '\\.h$'] ],
}],
- # Enable more direct string conversions on platforms with native utf8
- # strings
- ['OS=="mac" or OS=="ios" or <(chromeos)==1 or <(chromecast)==1', {
- 'defines': ['SYSTEM_NATIVE_UTF8'],
- }],
],
}],
['base_i18n_target==1', {
@@ -1055,7 +1050,12 @@
'i18n/utf8_validator_tables.cc',
'i18n/utf8_validator_tables.h',
],
- }]
+ }],
+ # Enable more direct string conversions on platforms with native utf8
+ # strings
+ ['OS=="mac" or OS=="ios" or <(chromeos)==1 or <(chromecast)==1', {
+ 'defines': ['SYSTEM_NATIVE_UTF8'],
+ }],
],
},
}
« no previous file with comments | « no previous file | base/test/BUILD.gn » ('j') | base/test/scoped_locale.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698