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

Side by Side Diff: build/java_apk.gypi

Issue 330203006: Add an empty native library to gyp_managed_install's incomplete apks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | « build/android/gyp/touch.py ('k') | no next file » | 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 # 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 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 '<@(extra_native_libs)', 314 '<@(extra_native_libs)',
315 ], 315 ],
316 'stamp': '<(strip_stamp)' 316 'stamp': '<(strip_stamp)'
317 }, 317 },
318 'includes': ['../build/android/strip_native_libraries.gypi'], 318 'includes': ['../build/android/strip_native_libraries.gypi'],
319 }, 319 },
320 ], 320 ],
321 'conditions': [ 321 'conditions': [
322 ['gyp_managed_install == 1', { 322 ['gyp_managed_install == 1', {
323 'variables': { 323 'variables': {
324 'placeholder_native_library_path':
325 '<(apk_package_native_libs_dir)/<(android_app_abi)/libfix.crbug.38 4638.so',
Yaron 2014/06/14 00:39:15 Maybe add a comment that this just needs to be pla
326 'package_input_paths': [ '<(placeholder_native_library_path)' ],
324 'libraries_top_dir': '<(intermediate_dir)/lib.stripped', 327 'libraries_top_dir': '<(intermediate_dir)/lib.stripped',
325 'libraries_source_dir': '<(libraries_top_dir)/lib/<(android_app_abi) ', 328 'libraries_source_dir': '<(libraries_top_dir)/lib/<(android_app_abi) ',
326 'device_library_dir': '<(device_intermediate_dir)/lib.stripped', 329 'device_library_dir': '<(device_intermediate_dir)/lib.stripped',
327 'configuration_name': '<(CONFIGURATION_NAME)', 330 'configuration_name': '<(CONFIGURATION_NAME)',
328 }, 331 },
329 'dependencies': [ 332 'dependencies': [
330 '<(DEPTH)/build/android/setup.gyp:get_build_device_configurations', 333 '<(DEPTH)/build/android/setup.gyp:get_build_device_configurations',
331 ], 334 ],
332 'actions': [ 335 'actions': [
333 { 336 {
334 'includes': ['../build/android/push_libraries.gypi'], 337 'includes': ['../build/android/push_libraries.gypi'],
335 }, 338 },
336 { 339 {
340 'action_name': 'create placeholder lib',
341 'inputs': [
342 '<(DEPTH)/build/android/gyp/touch.py',
343 ],
344 'outputs': [
345 '<(placeholder_native_library_path)',
346 ],
347 'action' : [
348 'python', '<(DEPTH)/build/android/gyp/touch.py',
349 '<@(_outputs)',
350 ],
351 },
352 {
337 'action_name': 'create device library symlinks', 353 'action_name': 'create device library symlinks',
338 'message': 'Creating links on device for <(_target_name)', 354 'message': 'Creating links on device for <(_target_name)',
339 'inputs': [ 355 'inputs': [
340 '<(DEPTH)/build/android/gyp/util/build_utils.py', 356 '<(DEPTH)/build/android/gyp/util/build_utils.py',
341 '<(DEPTH)/build/android/gyp/create_device_library_links.py', 357 '<(DEPTH)/build/android/gyp/create_device_library_links.py',
342 '<(apk_install_record)', 358 '<(apk_install_record)',
343 '<(build_device_config_path)', 359 '<(build_device_config_path)',
344 '<(ordered_libraries_file)', 360 '<(ordered_libraries_file)',
345 ], 361 ],
346 'outputs': [ 362 'outputs': [
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 '-DEMMA_INSTRUMENT=<(emma_instrument)', 804 '-DEMMA_INSTRUMENT=<(emma_instrument)',
789 '-DEMMA_DEVICE_JAR=<(emma_device_jar)', 805 '-DEMMA_DEVICE_JAR=<(emma_device_jar)',
790 806
791 '-Dbasedir=.', 807 '-Dbasedir=.',
792 '-buildfile', 808 '-buildfile',
793 '<(DEPTH)/build/android/ant/apk-package.xml', 809 '<(DEPTH)/build/android/ant/apk-package.xml',
794 ] 810 ]
795 }, 811 },
796 ], 812 ],
797 } 813 }
OLDNEW
« no previous file with comments | « build/android/gyp/touch.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698