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

Side by Side Diff: chrome/chrome.gyp

Issue 1301613002: Allow overriding Chromium-branded Android resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 | « chrome/android/java/res_default/values/channel_constants.xml ('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 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 '../third_party/android_tools/android_tools.gyp:android_support_v7_a ppcompat_javalib', 612 '../third_party/android_tools/android_tools.gyp:android_support_v7_a ppcompat_javalib',
613 '../third_party/android_tools/android_tools.gyp:android_support_v7_m ediarouter_javalib', 613 '../third_party/android_tools/android_tools.gyp:android_support_v7_m ediarouter_javalib',
614 '../third_party/android_tools/android_tools.gyp:android_support_v7_r ecyclerview_javalib', 614 '../third_party/android_tools/android_tools.gyp:android_support_v7_r ecyclerview_javalib',
615 '../third_party/android_tools/android_tools.gyp:android_support_v13_ javalib', 615 '../third_party/android_tools/android_tools.gyp:android_support_v13_ javalib',
616 '../third_party/android_tools/android_tools.gyp:google_play_services _javalib', 616 '../third_party/android_tools/android_tools.gyp:google_play_services _javalib',
617 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_javalib', 617 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_javalib',
618 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', 618 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
619 '../ui/android/ui_android.gyp:ui_java', 619 '../ui/android/ui_android.gyp:ui_java',
620 ], 620 ],
621 'variables': { 621 'variables': {
622 'variables': {
623 'android_branding_res_dirs%': ['<(java_in_dir)/res_chromium'],
624 },
622 'java_in_dir': '../chrome/android/java', 625 'java_in_dir': '../chrome/android/java',
623 'has_java_resources': 1, 626 'has_java_resources': 1,
624 'R_package': 'org.chromium.chrome', 627 'R_package': 'org.chromium.chrome',
625 'R_package_relpath': 'org/chromium/chrome', 628 'R_package_relpath': 'org/chromium/chrome',
626 # Include channel-specific resources and xml string files generated 629 # Include channel-specific resources and xml string files generated
627 # from generated_resources.grd 630 # from generated_resources.grd
628 'res_channel_dir': '<(java_in_dir)/res_default',
629 'res_extra_dirs': [ 631 'res_extra_dirs': [
630 '<(res_channel_dir)', 632 '<@(android_branding_res_dirs)',
631 '<(SHARED_INTERMEDIATE_DIR)/chrome/java/res', 633 '<(SHARED_INTERMEDIATE_DIR)/chrome/java/res',
632 ], 634 ],
633 'res_extra_files': [ 635 'res_extra_files': [
634 '<!@(find <(res_channel_dir) -type f)', 636 '<!@(find <(android_branding_res_dirs) -type f)',
635 '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_I NTERMEDIATE_DIR)/chrome" app/generated_resources.grd)', 637 '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_I NTERMEDIATE_DIR)/chrome" app/generated_resources.grd)',
636 ], 638 ],
637 }, 639 },
638 'conditions': [ 640 'conditions': [
639 ['configuration_policy != 1', { 641 ['configuration_policy != 1', {
640 'dependencies!': [ 642 'dependencies!': [
641 '../components/components.gyp:app_restrictions_resources', 643 '../components/components.gyp:app_restrictions_resources',
642 ], 644 ],
643 }], 645 }],
644 ], 646 ],
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 '<(DEPTH)/third_party/kasko' 833 '<(DEPTH)/third_party/kasko'
832 ], 834 ],
833 }, 835 },
834 }, 836 },
835 }, 837 },
836 }, 838 },
837 ], 839 ],
838 }], 840 }],
839 ], # 'conditions' 841 ], # 'conditions'
840 } 842 }
OLDNEW
« no previous file with comments | « chrome/android/java/res_default/values/channel_constants.xml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698