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

Side by Side Diff: chrome/chrome.gyp

Issue 880083004: Change which manifest and resources are passed to lint.py. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added resource_dir to chrome_java target. Created 5 years, 10 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/lint_action.gypi ('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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 '../components/components.gyp:variations_java', 623 '../components/components.gyp:variations_java',
624 '../components/components.gyp:web_contents_delegate_android_java', 624 '../components/components.gyp:web_contents_delegate_android_java',
625 '../content/content.gyp:content_java', 625 '../content/content.gyp:content_java',
626 '../printing/printing.gyp:printing_java', 626 '../printing/printing.gyp:printing_java',
627 '../sync/sync.gyp:sync_java', 627 '../sync/sync.gyp:sync_java',
628 '../third_party/android_tools/android_tools.gyp:android_support_v7_a ppcompat_javalib', 628 '../third_party/android_tools/android_tools.gyp:android_support_v7_a ppcompat_javalib',
629 '../third_party/android_tools/android_tools.gyp:android_support_v13_ javalib', 629 '../third_party/android_tools/android_tools.gyp:android_support_v13_ javalib',
630 '../ui/android/ui_android.gyp:ui_java', 630 '../ui/android/ui_android.gyp:ui_java',
631 ], 631 ],
632 'variables': { 632 'variables': {
633 'java_in_dir': '../chrome/android/java', 633 'java_in_dir': 'android/java',
634 'resource_dir': 'android/java/res',
cjhopman 2015/02/05 19:48:28 This is really confusing. If you specify something
634 'has_java_resources': 1, 635 'has_java_resources': 1,
635 'R_package': 'org.chromium.chrome', 636 'R_package': 'org.chromium.chrome',
636 'R_package_relpath': 'org/chromium/chrome', 637 'R_package_relpath': 'org/chromium/chrome',
637 # Include xml string files generated from generated_resources.grd 638 # Include xml string files generated from generated_resources.grd
638 'res_extra_dirs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/java/res'], 639 'res_extra_dirs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/java/res'],
639 'res_extra_files': ['<!@pymod_do_main(grit_info <@(grit_defines) --o utputs "<(SHARED_INTERMEDIATE_DIR)/chrome" app/generated_resources.grd)'], 640 'res_extra_files': ['<!@pymod_do_main(grit_info <@(grit_defines) --o utputs "<(SHARED_INTERMEDIATE_DIR)/chrome" app/generated_resources.grd)'],
640 }, 641 },
641 'includes': [ 642 'includes': [
642 '../build/java.gypi', 643 '../build/java.gypi',
643 ], 644 ],
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
778 'service/service_utility_process_host.cc', 779 'service/service_utility_process_host.cc',
779 'service/service_utility_process_host.h', 780 'service/service_utility_process_host.h',
780 ], 781 ],
781 }], 782 }],
782 ], 783 ],
783 }, 784 },
784 ], 785 ],
785 }], 786 }],
786 ], # 'conditions' 787 ], # 'conditions'
787 } 788 }
OLDNEW
« no previous file with comments | « build/android/lint_action.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698