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

Side by Side Diff: build/java_apk.gypi

Issue 1104703003: Actually use --extra-r-text-files in process_resources.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use correct R class in SyncCustomizationFragmentTest Created 5 years, 7 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
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 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 ['is_test_apk == 1', { 603 ['is_test_apk == 1', {
604 'dependencies_res_zip_paths=': [], 604 'dependencies_res_zip_paths=': [],
605 'additional_res_packages=': [], 605 'additional_res_packages=': [],
606 }], 606 }],
607 ['res_v14_verify_only == 1', { 607 ['res_v14_verify_only == 1', {
608 'process_resources_options+': ['--v14-verify-only'] 608 'process_resources_options+': ['--v14-verify-only']
609 }], 609 }],
610 ['shared_resources == 1', { 610 ['shared_resources == 1', {
611 'process_resources_options+': ['--shared-resources'] 611 'process_resources_options+': ['--shared-resources']
612 }], 612 }],
613 ['R_package != ""', {
614 'process_resources_options+': ['--custom-package', '<(R_package)']
615 }],
613 ], 616 ],
614 }, 617 },
615 'inputs': [ 618 'inputs': [
616 '<(DEPTH)/build/android/gyp/util/build_utils.py', 619 '<(DEPTH)/build/android/gyp/util/build_utils.py',
617 '<(DEPTH)/build/android/gyp/process_resources.py', 620 '<(DEPTH)/build/android/gyp/process_resources.py',
618 '<(android_manifest_path)', 621 '<(android_manifest_path)',
619 '>@(additional_input_paths)', 622 '>@(additional_input_paths)',
620 '>@(resource_input_paths)', 623 '>@(resource_input_paths)',
621 '>@(dependencies_res_zip_paths)', 624 '>@(dependencies_res_zip_paths)',
622 '>(inputs_list_file)', 625 '>(inputs_list_file)',
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
954 '-DEMMA_INSTRUMENT=<(emma_instrument)', 957 '-DEMMA_INSTRUMENT=<(emma_instrument)',
955 '-DEMMA_DEVICE_JAR=<(emma_device_jar)', 958 '-DEMMA_DEVICE_JAR=<(emma_device_jar)',
956 959
957 '-Dbasedir=.', 960 '-Dbasedir=.',
958 '-buildfile', 961 '-buildfile',
959 '<(DEPTH)/build/android/ant/apk-package.xml', 962 '<(DEPTH)/build/android/ant/apk-package.xml',
960 ] 963 ]
961 }, 964 },
962 ], 965 ],
963 } 966 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698