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

Side by Side Diff: build/java_apk.gypi

Issue 59533009: Check library version and handle library load errors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix BrowserStartupControllerTest Created 7 years 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
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 # This file is meant to be included into a target to provide a rule 5 # This file is meant to be included into a target to provide a rule
6 # to build Android APKs in a consistent manner. 6 # to build Android APKs in a consistent manner.
7 # 7 #
8 # To use this, create a gyp target with the following form: 8 # To use this, create a gyp target with the following form:
9 # { 9 # {
10 # 'target_name': 'my_package_apk', 10 # 'target_name': 'my_package_apk',
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 'ordered_libraries_file': '<(intermediate_dir)/native_libraries.json', 82 'ordered_libraries_file': '<(intermediate_dir)/native_libraries.json',
83 # TODO(cjhopman): build/ shouldn't refer to content/. The libraryloader and 83 # TODO(cjhopman): build/ shouldn't refer to content/. The libraryloader and
84 # nativelibraries template should be moved out of content/ (to base/?). 84 # nativelibraries template should be moved out of content/ (to base/?).
85 # http://crbug.com/225101 85 # http://crbug.com/225101
86 'native_libraries_template': '<(DEPTH)/content/public/android/java/templates /NativeLibraries.template', 86 'native_libraries_template': '<(DEPTH)/content/public/android/java/templates /NativeLibraries.template',
87 'native_libraries_java_dir': '<(intermediate_dir)/native_libraries_java/', 87 'native_libraries_java_dir': '<(intermediate_dir)/native_libraries_java/',
88 'native_libraries_java_file': '<(native_libraries_java_dir)/NativeLibraries. java', 88 'native_libraries_java_file': '<(native_libraries_java_dir)/NativeLibraries. java',
89 'native_libraries_java_stamp': '<(intermediate_dir)/native_libraries_java.st amp', 89 'native_libraries_java_stamp': '<(intermediate_dir)/native_libraries_java.st amp',
90 'native_libraries_template_data_dir': '<(intermediate_dir)/native_libraries/ ', 90 'native_libraries_template_data_dir': '<(intermediate_dir)/native_libraries/ ',
91 'native_libraries_template_data_file': '<(native_libraries_template_data_dir )/native_libraries_array.h', 91 'native_libraries_template_data_file': '<(native_libraries_template_data_dir )/native_libraries_array.h',
92 'native_libraries_template_data_stamp': '<(intermediate_dir)/native_librarie s_template_data.stamp', 92 'native_libraries_template_version_file': '<(native_libraries_template_data_ dir)/native_libraries_version.h',
93 'compile_stamp': '<(intermediate_dir)/compile.stamp', 93 'compile_stamp': '<(intermediate_dir)/compile.stamp',
94 'instr_stamp': '<(intermediate_dir)/instr.stamp', 94 'instr_stamp': '<(intermediate_dir)/instr.stamp',
95 'jar_stamp': '<(intermediate_dir)/jar.stamp', 95 'jar_stamp': '<(intermediate_dir)/jar.stamp',
96 'obfuscate_stamp': '<(intermediate_dir)/obfuscate.stamp', 96 'obfuscate_stamp': '<(intermediate_dir)/obfuscate.stamp',
97 'strip_stamp': '<(intermediate_dir)/strip.stamp', 97 'strip_stamp': '<(intermediate_dir)/strip.stamp',
98 'classes_dir': '<(intermediate_dir)/classes', 98 'classes_dir': '<(intermediate_dir)/classes',
99 'classes_final_dir': '<(intermediate_dir)/classes_instr', 99 'classes_final_dir': '<(intermediate_dir)/classes_instr',
100 'javac_includes': [], 100 'javac_includes': [],
101 'jar_excluded_classes': [], 101 'jar_excluded_classes': [],
102 'jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)', 102 'jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)',
(...skipping 10 matching lines...) Expand all
113 'incomplete_apk_path': '<(intermediate_dir)/<(apk_name)-incomplete.apk', 113 'incomplete_apk_path': '<(intermediate_dir)/<(apk_name)-incomplete.apk',
114 'source_dir': '<(java_in_dir)/src', 114 'source_dir': '<(java_in_dir)/src',
115 'apk_install_record': '<(intermediate_dir)/apk_install.record.stamp', 115 'apk_install_record': '<(intermediate_dir)/apk_install.record.stamp',
116 'device_intermediate_dir': '/data/local/tmp/chromium/<(_target_name)/<(CONFI GURATION_NAME)', 116 'device_intermediate_dir': '/data/local/tmp/chromium/<(_target_name)/<(CONFI GURATION_NAME)',
117 'symlink_script_host_path': '<(intermediate_dir)/create_symlinks.sh', 117 'symlink_script_host_path': '<(intermediate_dir)/create_symlinks.sh',
118 'symlink_script_device_path': '<(device_intermediate_dir)/create_symlinks.sh ', 118 'symlink_script_device_path': '<(device_intermediate_dir)/create_symlinks.sh ',
119 'create_standalone_apk%': 1, 119 'create_standalone_apk%': 1,
120 'variables': { 120 'variables': {
121 'variables': { 121 'variables': {
122 'native_lib_target%': '', 122 'native_lib_target%': '',
123 'native_lib_version_name%': '',
123 'use_content_linker%': 0, 124 'use_content_linker%': 0,
124 'enable_content_linker_tests%': 0, 125 'enable_content_linker_tests%': 0,
125 'is_test_apk%': 0, 126 'is_test_apk%': 0,
126 }, 127 },
127 'conditions': [ 128 'conditions': [
128 ['gyp_managed_install == 1 and native_lib_target != ""', { 129 ['gyp_managed_install == 1 and native_lib_target != ""', {
129 'unsigned_standalone_apk_path': '<(intermediate_dir)/<(apk_name)-stand alone-unsigned.apk', 130 'unsigned_standalone_apk_path': '<(intermediate_dir)/<(apk_name)-stand alone-unsigned.apk',
130 }, { 131 }, {
131 'unsigned_standalone_apk_path': '<(unsigned_apk_path)', 132 'unsigned_standalone_apk_path': '<(unsigned_apk_path)',
132 }], 133 }],
133 ['gyp_managed_install == 1', { 134 ['gyp_managed_install == 1', {
134 'apk_package_native_libs_dir': '<(intermediate_dir)/libs.managed', 135 'apk_package_native_libs_dir': '<(intermediate_dir)/libs.managed',
135 }, { 136 }, {
136 'apk_package_native_libs_dir': '<(intermediate_dir)/libs', 137 'apk_package_native_libs_dir': '<(intermediate_dir)/libs',
137 }], 138 }],
138 ['is_test_apk == 0 and emma_coverage != 0', { 139 ['is_test_apk == 0 and emma_coverage != 0', {
139 'emma_instrument': 1, 140 'emma_instrument': 1,
140 },{ 141 },{
141 'emma_instrument': 0, 142 'emma_instrument': 0,
142 }], 143 }],
143 ], 144 ],
144 }, 145 },
145 'native_lib_target%': '', 146 'native_lib_target%': '',
147 'native_lib_version_name%': '',
146 'use_content_linker%': 0, 148 'use_content_linker%': 0,
147 'enable_content_linker_tests%': 0, 149 'enable_content_linker_tests%': 0,
148 'emma_instrument': '<(emma_instrument)', 150 'emma_instrument': '<(emma_instrument)',
149 'apk_package_native_libs_dir': '<(apk_package_native_libs_dir)', 151 'apk_package_native_libs_dir': '<(apk_package_native_libs_dir)',
150 'unsigned_standalone_apk_path': '<(unsigned_standalone_apk_path)', 152 'unsigned_standalone_apk_path': '<(unsigned_standalone_apk_path)',
151 'extra_native_libs': [], 153 'extra_native_libs': [],
152 }, 154 },
153 # Pass the jar path to the apk's "fake" jar target. This would be better as 155 # Pass the jar path to the apk's "fake" jar target. This would be better as
154 # direct_dependent_settings, but a variable set by a direct_dependent_settings 156 # direct_dependent_settings, but a variable set by a direct_dependent_settings
155 # cannot be lifted in a dependent to all_dependent_settings. 157 # cannot be lifted in a dependent to all_dependent_settings.
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 }, 234 },
233 { 235 {
234 'action_name': 'native_libraries_template_data_<(_target_name)', 236 'action_name': 'native_libraries_template_data_<(_target_name)',
235 'message': 'Creating native_libraries_list.h for <(_target_name)', 237 'message': 'Creating native_libraries_list.h for <(_target_name)',
236 'inputs': [ 238 'inputs': [
237 '<(DEPTH)/build/android/gyp/util/build_utils.py', 239 '<(DEPTH)/build/android/gyp/util/build_utils.py',
238 '<(DEPTH)/build/android/gyp/create_native_libraries_header.py', 240 '<(DEPTH)/build/android/gyp/create_native_libraries_header.py',
239 '<(ordered_libraries_file)', 241 '<(ordered_libraries_file)',
240 ], 242 ],
241 'outputs': [ 243 'outputs': [
242 '<(native_libraries_template_data_stamp)', 244 '<(native_libraries_template_data_file)',
245 '<(native_libraries_template_version_file)',
243 ], 246 ],
244 'action': [ 247 'action': [
245 'python', '<(DEPTH)/build/android/gyp/create_native_libraries_header .py', 248 'python', '<(DEPTH)/build/android/gyp/create_native_libraries_header .py',
246 '--ordered-libraries=<(ordered_libraries_file)', 249 '--ordered-libraries=<(ordered_libraries_file)',
247 '--output=<(native_libraries_template_data_file)', 250 '--version-name=<(native_lib_version_name)',
248 '--stamp=<(native_libraries_template_data_stamp)', 251 '--native-library-list=<(native_libraries_template_data_file)',
252 '--version-output=<(native_libraries_template_version_file)',
249 ], 253 ],
250 }, 254 },
251 { 255 {
252 'action_name': 'native_libraries_<(_target_name)', 256 'action_name': 'native_libraries_<(_target_name)',
253 'variables': { 257 'variables': {
254 'conditions': [ 258 'conditions': [
255 ['use_content_linker == 1', { 259 ['use_content_linker == 1', {
256 'variables': { 260 'variables': {
257 'linker_gcc_preprocess_defines': [ 261 'linker_gcc_preprocess_defines': [
258 '--defines', 'ENABLE_CONTENT_LINKER', 262 '--defines', 'ENABLE_CONTENT_LINKER',
(...skipping 18 matching lines...) Expand all
277 ], 281 ],
278 'gcc_preprocess_defines': [ 282 'gcc_preprocess_defines': [
279 '<@(linker_gcc_preprocess_defines)', 283 '<@(linker_gcc_preprocess_defines)',
280 '<@(linker_tests_gcc_preprocess_defines)', 284 '<@(linker_tests_gcc_preprocess_defines)',
281 ], 285 ],
282 }, 286 },
283 'message': 'Creating NativeLibraries.java for <(_target_name).', 287 'message': 'Creating NativeLibraries.java for <(_target_name).',
284 'inputs': [ 288 'inputs': [
285 '<(DEPTH)/build/android/gyp/util/build_utils.py', 289 '<(DEPTH)/build/android/gyp/util/build_utils.py',
286 '<(DEPTH)/build/android/gyp/gcc_preprocess.py', 290 '<(DEPTH)/build/android/gyp/gcc_preprocess.py',
287 '<(native_libraries_template_data_stamp)', 291 '<(native_libraries_template_data_file)',
292 '<(native_libraries_template_version_file)',
288 '<(native_libraries_template)', 293 '<(native_libraries_template)',
289 ], 294 ],
290 'outputs': [ 295 'outputs': [
291 '<(native_libraries_java_stamp)', 296 '<(native_libraries_java_stamp)',
292 ], 297 ],
293 'action': [ 298 'action': [
294 'python', '<(DEPTH)/build/android/gyp/gcc_preprocess.py', 299 'python', '<(DEPTH)/build/android/gyp/gcc_preprocess.py',
295 '--include-path=<(native_libraries_template_data_dir)', 300 '--include-path=<(native_libraries_template_data_dir)',
296 '--output=<(native_libraries_java_file)', 301 '--output=<(native_libraries_java_file)',
297 '--template=<(native_libraries_template)', 302 '--template=<(native_libraries_template)',
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 '<(DEPTH)/build/android/ant/apk-package.xml', 747 '<(DEPTH)/build/android/ant/apk-package.xml',
743 748
744 # Add list of inputs to the command line, so if inputs change 749 # Add list of inputs to the command line, so if inputs change
745 # (e.g. if a Java file is removed), the command will be re-run. 750 # (e.g. if a Java file is removed), the command will be re-run.
746 # TODO(newt): remove this once crbug.com/177552 is fixed in ninja. 751 # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
747 '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)', 752 '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)',
748 ] 753 ]
749 }, 754 },
750 ], 755 ],
751 } 756 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698