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

Side by Side Diff: chrome/chrome.gyp

Issue 865733002: Make Chrome for Android dependent on Google Play Services (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix description 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 | « chrome/android/BUILD.gn ('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 608 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 '../components/components.gyp:gcm_driver_java', 619 '../components/components.gyp:gcm_driver_java',
620 '../components/components.gyp:invalidation_java', 620 '../components/components.gyp:invalidation_java',
621 '../components/components.gyp:navigation_interception_java', 621 '../components/components.gyp:navigation_interception_java',
622 '../components/components.gyp:variations_java', 622 '../components/components.gyp:variations_java',
623 '../components/components.gyp:web_contents_delegate_android_java', 623 '../components/components.gyp:web_contents_delegate_android_java',
624 '../content/content.gyp:content_java', 624 '../content/content.gyp:content_java',
625 '../printing/printing.gyp:printing_java', 625 '../printing/printing.gyp:printing_java',
626 '../sync/sync.gyp:sync_java', 626 '../sync/sync.gyp:sync_java',
627 '../third_party/android_tools/android_tools.gyp:android_support_v7_a ppcompat_javalib', 627 '../third_party/android_tools/android_tools.gyp:android_support_v7_a ppcompat_javalib',
628 '../third_party/android_tools/android_tools.gyp:android_support_v13_ javalib', 628 '../third_party/android_tools/android_tools.gyp:android_support_v13_ javalib',
629 '../third_party/android_tools/android_tools.gyp:google_play_services _javalib',
630 '../third_party/libaddressinput/libaddressinput.gyp:android_addressi nput_widget',
nyquist 2015/02/05 22:32:08 Is this related to this change or is it here by ac
aberent 2015/02/06 20:17:58 Done. It was there by accident (probably a bad mer
629 '../ui/android/ui_android.gyp:ui_java', 631 '../ui/android/ui_android.gyp:ui_java',
630 ], 632 ],
631 'variables': { 633 'variables': {
632 'java_in_dir': '../chrome/android/java', 634 'java_in_dir': '../chrome/android/java',
633 'has_java_resources': 1, 635 'has_java_resources': 1,
634 'R_package': 'org.chromium.chrome', 636 'R_package': 'org.chromium.chrome',
635 'R_package_relpath': 'org/chromium/chrome', 637 'R_package_relpath': 'org/chromium/chrome',
636 # Include xml string files generated from generated_resources.grd 638 # Include xml string files generated from generated_resources.grd
637 'res_extra_dirs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/java/res'], 639 'res_extra_dirs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/java/res'],
638 '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)'],
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 'target_name': 'page_info_connection_type_java', 677 'target_name': 'page_info_connection_type_java',
676 'type': 'none', 678 'type': 'none',
677 'variables': { 679 'variables': {
678 'source_file': 'browser/ui/android/website_settings_popup_android.h' , 680 'source_file': 'browser/ui/android/website_settings_popup_android.h' ,
679 }, 681 },
680 'includes': [ '../build/android/java_cpp_enum.gypi' ], 682 'includes': [ '../build/android/java_cpp_enum.gypi' ],
681 }, 683 },
682 ], # 'targets' 684 ], # 'targets'
683 'includes': [ 685 'includes': [
684 'chrome_android.gypi', 686 'chrome_android.gypi',
685 ]}, # 'includes' 687 ]}, #includes
686 ], # OS=="android" 688 ], # OS=="android"
687 ['configuration_policy==1 and OS!="android" and OS!="ios"', { 689 ['configuration_policy==1 and OS!="android" and OS!="ios"', {
688 'includes': [ 'policy.gypi', ], 690 'includes': [ 'policy.gypi', ],
689 }], 691 }],
690 ['enable_extensions==1', { 692 ['enable_extensions==1', {
691 'includes': [ 693 'includes': [
692 'chrome_browser_extensions.gypi', 694 'chrome_browser_extensions.gypi',
693 ], 695 ],
694 }], 696 }],
695 ['enable_print_preview==1', { 697 ['enable_print_preview==1', {
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 'service/service_utility_process_host.cc', 779 'service/service_utility_process_host.cc',
778 'service/service_utility_process_host.h', 780 'service/service_utility_process_host.h',
779 ], 781 ],
780 }], 782 }],
781 ], 783 ],
782 }, 784 },
783 ], 785 ],
784 }], 786 }],
785 ], # 'conditions' 787 ], # 'conditions'
786 } 788 }
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698