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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_shell.gypi

Issue 156333002: Enable icu_use_data_file_flag on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add else-branch (android_webview_build==1) 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
« build/common.gypi ('K') | « content/content.gyp ('k') | content/content_tests.gypi » ('j') | content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 9a9537f5b283541634fed70b920ef6f61c156218..665645a0110e017c12294b3a9929f89427a118e3 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -1042,6 +1042,7 @@
'target_name': 'content_shell_apk',
'type': 'none',
'dependencies': [
+ 'content.gyp:content_icudata',
'content.gyp:content_java',
'content_java_test_support',
'content_shell_java',
@@ -1060,6 +1061,13 @@
'native_lib_target': 'libcontent_shell_content_view',
'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
+ 'conditions': [
+ ['icu_use_data_file_flag==1', {
+ 'additional_input_paths': [
+ '<(PRODUCT_DIR)/icudtl.dat',
+ ],
+ }],
+ ],
},
'conditions': [
['android_webview_build==0', {
« build/common.gypi ('K') | « content/content.gyp ('k') | content/content_tests.gypi » ('j') | content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698