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

Side by Side 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: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 # The "19" is so that sites that sniff for version think that this is 8 # The "19" is so that sites that sniff for version think that this is
9 # something reasonably current; the "77.34.5" is a hint that this isn't a 9 # something reasonably current; the "77.34.5" is a hint that this isn't a
10 # standard Chrome. 10 # standard Chrome.
(...skipping 1042 matching lines...) Expand 10 before | Expand all | Expand 10 after
1053 '../ui/android/ui_android.gyp:ui_java', 1053 '../ui/android/ui_android.gyp:ui_java',
1054 ], 1054 ],
1055 'variables': { 1055 'variables': {
1056 'apk_name': 'ContentShell', 1056 'apk_name': 'ContentShell',
1057 'manifest_package_name': 'org.chromium.content_shell_apk', 1057 'manifest_package_name': 'org.chromium.content_shell_apk',
1058 'java_in_dir': 'shell/android/shell_apk', 1058 'java_in_dir': 'shell/android/shell_apk',
1059 'resource_dir': 'shell/android/shell_apk/res', 1059 'resource_dir': 'shell/android/shell_apk/res',
1060 'native_lib_target': 'libcontent_shell_content_view', 1060 'native_lib_target': 'libcontent_shell_content_view',
1061 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 1061 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
1062 'asset_location': '<(PRODUCT_DIR)/content_shell/assets', 1062 'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
1063 'conditions': [
1064 ['icu_use_data_file_flag==1', {
1065 'additional_input_paths': [
1066 '<(PRODUCT_DIR)/icudtl.dat',
1067 ],
1068 }],
1069 ],
1063 }, 1070 },
1064 'conditions': [ 1071 'conditions': [
1065 ['android_webview_build==0', { 1072 ['android_webview_build==0', {
1066 'dependencies': [ 1073 'dependencies': [
1067 '../tools/imagediff/image_diff.gyp:image_diff#host', 1074 '../tools/imagediff/image_diff.gyp:image_diff#host',
1068 ], 1075 ],
1069 }], 1076 }],
1077 ['icu_use_data_file_flag==1', {
1078 'copies': [
1079 {
1080 'destination': '<(asset_location)',
1081 'files': [
1082 '<(PRODUCT_DIR)/icudtl.dat',
1083 ],
1084 }
1085 ],
1086 }],
1070 ], 1087 ],
1071 'includes': [ '../build/java_apk.gypi' ], 1088 'includes': [ '../build/java_apk.gypi' ],
1072 }, 1089 },
1073 ], 1090 ],
1074 }], # OS=="android" 1091 }], # OS=="android"
1075 ['OS=="win"', { 1092 ['OS=="win"', {
1076 'targets': [ 1093 'targets': [
1077 { 1094 {
1078 'target_name': 'content_shell_crash_service', 1095 'target_name': 'content_shell_crash_service',
1079 'type': 'executable', 1096 'type': 'executable',
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
1123 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1140 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1124 '--destination_dir', '<(dest_dir)', 1141 '--destination_dir', '<(dest_dir)',
1125 ], 1142 ],
1126 }, 1143 },
1127 ], 1144 ],
1128 }, 1145 },
1129 ], 1146 ],
1130 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1147 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1131 ] 1148 ]
1132 } 1149 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698