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

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: rebased Created 6 years, 9 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
« no previous file with comments | « content/content.gyp ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1026 matching lines...) Expand 10 before | Expand all | Expand 10 after
1037 'type': 'none', 1037 'type': 'none',
1038 'dependencies': [ 1038 'dependencies': [
1039 'content_shell_apk', 1039 'content_shell_apk',
1040 ], 1040 ],
1041 'includes': [ '../build/apk_fake_jar.gypi' ], 1041 'includes': [ '../build/apk_fake_jar.gypi' ],
1042 }, 1042 },
1043 { 1043 {
1044 'target_name': 'content_shell_apk', 1044 'target_name': 'content_shell_apk',
1045 'type': 'none', 1045 'type': 'none',
1046 'dependencies': [ 1046 'dependencies': [
1047 'content.gyp:content_icudata',
1047 'content.gyp:content_java', 1048 'content.gyp:content_java',
1048 'content_java_test_support', 1049 'content_java_test_support',
1049 'content_shell_java', 1050 'content_shell_java',
1050 'libcontent_shell_content_view', 1051 'libcontent_shell_content_view',
1051 '../base/base.gyp:base_java', 1052 '../base/base.gyp:base_java',
1052 '../media/media.gyp:media_java', 1053 '../media/media.gyp:media_java',
1053 '../net/net.gyp:net_java', 1054 '../net/net.gyp:net_java',
1054 '../third_party/mesa/mesa.gyp:osmesa_in_lib_dir', 1055 '../third_party/mesa/mesa.gyp:osmesa_in_lib_dir',
1055 '../tools/android/forwarder/forwarder.gyp:forwarder', 1056 '../tools/android/forwarder/forwarder.gyp:forwarder',
1056 '../ui/android/ui_android.gyp:ui_java', 1057 '../ui/android/ui_android.gyp:ui_java',
1057 ], 1058 ],
1058 'variables': { 1059 'variables': {
1059 'apk_name': 'ContentShell', 1060 'apk_name': 'ContentShell',
1060 'manifest_package_name': 'org.chromium.content_shell_apk', 1061 'manifest_package_name': 'org.chromium.content_shell_apk',
1061 'java_in_dir': 'shell/android/shell_apk', 1062 'java_in_dir': 'shell/android/shell_apk',
1062 'resource_dir': 'shell/android/shell_apk/res', 1063 'resource_dir': 'shell/android/shell_apk/res',
1063 'native_lib_target': 'libcontent_shell_content_view', 1064 'native_lib_target': 'libcontent_shell_content_view',
1064 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 1065 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
1065 'asset_location': '<(PRODUCT_DIR)/content_shell/assets', 1066 'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
1066 'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'], 1067 'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'],
1068 'conditions': [
1069 ['icu_use_data_file_flag==1', {
1070 'additional_input_paths': [
1071 '<(PRODUCT_DIR)/icudtl.dat',
1072 ],
1073 }],
1074 ],
1067 }, 1075 },
1068 'conditions': [ 1076 'conditions': [
1069 ['android_webview_build==0', { 1077 ['android_webview_build==0', {
1070 'dependencies': [ 1078 'dependencies': [
1071 '../tools/imagediff/image_diff.gyp:image_diff#host', 1079 '../tools/imagediff/image_diff.gyp:image_diff#host',
1072 ], 1080 ],
1073 }], 1081 }],
1074 ], 1082 ],
1075 'includes': [ '../build/java_apk.gypi' ], 1083 'includes': [ '../build/java_apk.gypi' ],
1076 }, 1084 },
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
1127 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1135 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1128 '--destination_dir', '<(dest_dir)', 1136 '--destination_dir', '<(dest_dir)',
1129 ], 1137 ],
1130 }, 1138 },
1131 ], 1139 ],
1132 }, 1140 },
1133 ], 1141 ],
1134 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1142 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1135 ] 1143 ]
1136 } 1144 }
OLDNEW
« no previous file with comments | « content/content.gyp ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698