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

Side by Side Diff: build/java_apk.gypi

Issue 362543004: Fix generation of v14 resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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
« no previous file with comments | « build/android/gyp/generate_v14_compatible_resources.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 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 '--android-sdk-tools', '<(android_sdk_tools)', 487 '--android-sdk-tools', '<(android_sdk_tools)',
488 488
489 '--android-manifest', '<(android_manifest_path)', 489 '--android-manifest', '<(android_manifest_path)',
490 '--dependencies-res-zips', '>(dependencies_res_zip_paths)', 490 '--dependencies-res-zips', '>(dependencies_res_zip_paths)',
491 491
492 '--extra-res-packages', '>(additional_res_packages)', 492 '--extra-res-packages', '>(additional_res_packages)',
493 '--extra-r-text-files', '>(additional_R_text_files)', 493 '--extra-r-text-files', '>(additional_R_text_files)',
494 494
495 '--proguard-file', '<(generated_proguard_file)', 495 '--proguard-file', '<(generated_proguard_file)',
496 496
497 '--resource-dir', '<(resource_dir)', 497 '--resource-dirs', '<(resource_dir)',
cjhopman 2014/06/30 21:46:10 did you know that python will accept any unique pr
newt (away) 2014/06/30 22:38:08 huh, funky. what about --halp ?
498 '--resource-zip-out', '<(resource_zip_path)', 498 '--resource-zip-out', '<(resource_zip_path)',
499 499
500 '--R-dir', '<(intermediate_dir)/gen', 500 '--R-dir', '<(intermediate_dir)/gen',
501 501
502 '--stamp', '<(codegen_stamp)', 502 '--stamp', '<(codegen_stamp)',
503 503
504 '<@(process_resources_options)', 504 '<@(process_resources_options)',
505 ], 505 ],
506 }, 506 },
507 { 507 {
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 '-DEMMA_INSTRUMENT=<(emma_instrument)', 793 '-DEMMA_INSTRUMENT=<(emma_instrument)',
794 '-DEMMA_DEVICE_JAR=<(emma_device_jar)', 794 '-DEMMA_DEVICE_JAR=<(emma_device_jar)',
795 795
796 '-Dbasedir=.', 796 '-Dbasedir=.',
797 '-buildfile', 797 '-buildfile',
798 '<(DEPTH)/build/android/ant/apk-package.xml', 798 '<(DEPTH)/build/android/ant/apk-package.xml',
799 ] 799 ]
800 }, 800 },
801 ], 801 ],
802 } 802 }
OLDNEW
« no previous file with comments | « build/android/gyp/generate_v14_compatible_resources.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698