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

Unified Diff: BUILD.gn

Issue 1646623006: Fix compilation errors on Android and Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: Created 4 years, 11 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 | README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index b6b2b64da52c30cd648c6d929c58a7aaa9105dfa..5009b50e1f5bbe80ea873e56588a951d30f12c1c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -61,7 +61,7 @@ config("icu_code") {
"/wd4267", # Conversion from size_t on 64-bits.
"/wd4996", # Deprecated functions.
]
- } else if (is_linux) {
+ } else if (is_linux || is_android) {
cflags += [
# Since ICU wants to internally use its own deprecated APIs, don't
# complain about it.
@@ -100,8 +100,6 @@ config("icu_code") {
# See http://bugs.icu-project.org/trac/ticket/11122
"-Wno-inline-new-delete",
"-Wno-implicit-exception-spec-mismatch",
- # See http://bugs.icu-project.org/trac/ticket/11757.
- "-Wno-reorder",
]
}
}
« no previous file with comments | « no previous file | README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698