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

Unified Diff: android_webview/android_webview_tests.gypi

Issue 156333002: Enable icu_use_data_file_flag on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Log.w -> Log.e in ResourceExtractor-deleteFiles 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
Index: android_webview/android_webview_tests.gypi
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
index 5ad85fe6c1c2c7fa5c91fe14af35ed1fe3ac9022..9eadf382f044b68eeafcc101a1bd66157b8a2d6e 100644
--- a/android_webview/android_webview_tests.gypi
+++ b/android_webview/android_webview_tests.gypi
@@ -22,6 +22,13 @@
'<(PRODUCT_DIR)/android_webview_apk/assets/asset_icon.png',
'<(PRODUCT_DIR)/android_webview_apk/assets/full_screen_video_test.html',
],
+ 'conditions': [
+ ['icu_use_data_file_flag==1', {
+ 'additional_input_paths': [
+ '<(PRODUCT_DIR)/icudtl.dat',
+ ],
+ }],
+ ],
},
'copies': [
{
@@ -31,6 +38,13 @@
'<(java_in_dir)/assets/asset_icon.png',
'<(java_in_dir)/assets/full_screen_video_test.html',
],
+ 'conditions': [
+ ['icu_use_data_file_flag==1', {
+ 'files': [
+ '<(PRODUCT_DIR)/icudtl.dat',
+ ],
+ }],
+ ],
},
],
'includes': [ '../build/java_apk.gypi' ],

Powered by Google App Engine
This is Rietveld 408576698