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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/common.gypi

Issue 156333002: Enable icu_use_data_file_flag on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: copy icudtl.dat to assets directory to be included in apk Created 6 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 | « build/android/pylib/gtest/setup.py ('k') | chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java » ('j') | content/content_tests.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 07a420b950fa4df2fe0cf7915b5ae39da6894b61..08aeb9f64a3848b9a017859c623fc8f16484dbee 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1307,8 +1307,9 @@
# can use breakpad for these builds.
'release_unwind_tables%': 0,
}],
- # TODO(jungshik): Turn this on on Android and Chrome OS
- ['OS!="android" and chromeos==0', {
+ # TODO(jshin): Turn this on on CrOS
+ # Should we also disable this when use_system_icu==1 on Linux?
+ ['chromeos==0 and android_webview_build==0', {
'icu_use_data_file_flag%': 1,
}],
],
« no previous file with comments | « build/android/pylib/gtest/setup.py ('k') | chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java » ('j') | content/content_tests.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698