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

Unified Diff: url/BUILD.gn

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « ui/gl/gl_mock_autogen_gl.h ('k') | url/url_canon.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: url/BUILD.gn
diff --git a/url/BUILD.gn b/url/BUILD.gn
index 964a08bde6a4e1ef68c2d72912b5d5aef299f0e5..03e90cb3fff083757c979c0cc9630e69337fefa0 100644
--- a/url/BUILD.gn
+++ b/url/BUILD.gn
@@ -58,11 +58,11 @@ component("url") {
defines = [ "URL_IMPLEMENTATION" ]
- configs += [
- ":url_icu_config",
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
- "//build/config/compiler:no_size_t_to_int_warning",
- ]
+ configs += [ ":url_icu_config" ]
+
+ if (is_win) {
+ cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ }
deps = [
"//base",
@@ -101,15 +101,19 @@ if (!is_android) {
"url_util_unittest.cc",
]
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
- configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-
#if (is_posix && !is_mac && !is_ios) {
# if (use_allocator!="none") {
# deps += "//base/allocator"
# }
#}
+ if (is_win) {
+ cflags = [
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ "/wd4267",
+ ]
+ }
+
deps = [
":url",
"//base",
« no previous file with comments | « ui/gl/gl_mock_autogen_gl.h ('k') | url/url_canon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698