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

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: 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 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 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after
1035 'type': 'none', 1035 'type': 'none',
1036 'dependencies': [ 1036 'dependencies': [
1037 'content_shell_apk', 1037 'content_shell_apk',
1038 ], 1038 ],
1039 'includes': [ '../build/apk_fake_jar.gypi' ], 1039 'includes': [ '../build/apk_fake_jar.gypi' ],
1040 }, 1040 },
1041 { 1041 {
1042 'target_name': 'content_shell_apk', 1042 'target_name': 'content_shell_apk',
1043 'type': 'none', 1043 'type': 'none',
1044 'dependencies': [ 1044 'dependencies': [
1045 'content.gyp:content_icudata',
1045 'content.gyp:content_java', 1046 'content.gyp:content_java',
1046 'content_java_test_support', 1047 'content_java_test_support',
1047 'content_shell_java', 1048 'content_shell_java',
1048 'libcontent_shell_content_view', 1049 'libcontent_shell_content_view',
1049 '../base/base.gyp:base_java', 1050 '../base/base.gyp:base_java',
1050 '../media/media.gyp:media_java', 1051 '../media/media.gyp:media_java',
1051 '../net/net.gyp:net_java', 1052 '../net/net.gyp:net_java',
1052 '../tools/android/forwarder/forwarder.gyp:forwarder', 1053 '../tools/android/forwarder/forwarder.gyp:forwarder',
1053 '../ui/android/ui_android.gyp:ui_java', 1054 '../ui/android/ui_android.gyp:ui_java',
1054 ], 1055 ],
1055 'variables': { 1056 'variables': {
1056 'apk_name': 'ContentShell', 1057 'apk_name': 'ContentShell',
1057 'manifest_package_name': 'org.chromium.content_shell_apk', 1058 'manifest_package_name': 'org.chromium.content_shell_apk',
1058 'java_in_dir': 'shell/android/shell_apk', 1059 'java_in_dir': 'shell/android/shell_apk',
1059 'resource_dir': 'shell/android/shell_apk/res', 1060 'resource_dir': 'shell/android/shell_apk/res',
1060 'native_lib_target': 'libcontent_shell_content_view', 1061 'native_lib_target': 'libcontent_shell_content_view',
1061 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 1062 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
1062 'asset_location': '<(PRODUCT_DIR)/content_shell/assets', 1063 'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
1064 'conditions': [
1065 ['icu_use_data_file_flag==1', {
1066 'additional_input_paths': [
1067 '<(PRODUCT_DIR)/icudtl.dat',
1068 ],
1069 }],
1070 ],
1063 }, 1071 },
1064 'conditions': [ 1072 'conditions': [
1065 ['android_webview_build==0', { 1073 ['android_webview_build==0', {
1066 'dependencies': [ 1074 'dependencies': [
1067 '../tools/imagediff/image_diff.gyp:image_diff#host', 1075 '../tools/imagediff/image_diff.gyp:image_diff#host',
1068 ], 1076 ],
1069 }], 1077 }],
1070 ], 1078 ],
1071 'includes': [ '../build/java_apk.gypi' ], 1079 'includes': [ '../build/java_apk.gypi' ],
1072 }, 1080 },
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
1123 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1131 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1124 '--destination_dir', '<(dest_dir)', 1132 '--destination_dir', '<(dest_dir)',
1125 ], 1133 ],
1126 }, 1134 },
1127 ], 1135 ],
1128 }, 1136 },
1129 ], 1137 ],
1130 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1138 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1131 ] 1139 ]
1132 } 1140 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698