| OLD | NEW |
| 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 611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 622 }, | 622 }, |
| 623 ]}, # 'targets' | 623 ]}, # 'targets' |
| 624 ], # OS=="win" and target_arch=="ia32" | 624 ], # OS=="win" and target_arch=="ia32" |
| 625 ['chromeos==1', { | 625 ['chromeos==1', { |
| 626 'includes': [ 'chrome_browser_chromeos.gypi' ], | 626 'includes': [ 'chrome_browser_chromeos.gypi' ], |
| 627 }], # chromeos==1 | 627 }], # chromeos==1 |
| 628 ['OS=="android"', | 628 ['OS=="android"', |
| 629 { | 629 { |
| 630 'targets': [ | 630 'targets': [ |
| 631 { | 631 { |
| 632 # GN: //chrome/android:chrome_java |
| 632 'target_name': 'chrome_java', | 633 'target_name': 'chrome_java', |
| 633 'type': 'none', | 634 'type': 'none', |
| 634 'dependencies': [ | 635 'dependencies': [ |
| 635 'activity_type_ids_java', | 636 'activity_type_ids_java', |
| 636 'app_banner_metrics_ids_java', | 637 'app_banner_metrics_ids_java', |
| 637 'chrome_resources.gyp:chrome_strings', | 638 'chrome_resources.gyp:chrome_strings', |
| 638 'chrome_strings_grd', | 639 'chrome_strings_grd', |
| 639 'profile_sync_service_model_type_selection_java', | 640 'profile_sync_service_model_type_selection_java', |
| 640 'resource_id_java', | 641 'resource_id_java', |
| 641 'toolbar_model_security_levels_java', | 642 'toolbar_model_security_levels_java', |
| 642 'tab_load_status_java', | 643 'tab_load_status_java', |
| 643 '../base/base.gyp:base', | 644 '../base/base.gyp:base', |
| 644 '../components/components.gyp:bookmarks_java', | 645 '../components/components.gyp:bookmarks_java', |
| 645 '../components/components.gyp:dom_distiller_core_java', | 646 '../components/components.gyp:dom_distiller_core_java', |
| 646 '../components/components.gyp:enhanced_bookmarks_java', | 647 '../components/components.gyp:enhanced_bookmarks_java', |
| 647 '../components/components.gyp:gcm_driver_java', | 648 '../components/components.gyp:gcm_driver_java', |
| 648 '../components/components.gyp:navigation_interception_java', | 649 '../components/components.gyp:navigation_interception_java', |
| 649 '../components/components.gyp:sessions', | |
| 650 '../components/components.gyp:variations_java', | 650 '../components/components.gyp:variations_java', |
| 651 '../components/components.gyp:web_contents_delegate_android_java', | 651 '../components/components.gyp:web_contents_delegate_android_java', |
| 652 '../content/content.gyp:content_java', | 652 '../content/content.gyp:content_java', |
| 653 '../printing/printing.gyp:printing_java', | 653 '../printing/printing.gyp:printing_java', |
| 654 '../sync/sync.gyp:sync_java', | 654 '../sync/sync.gyp:sync_java', |
| 655 '../third_party/android_tools/android_tools.gyp:android_support_v7_a
ppcompat_javalib', | 655 '../third_party/android_tools/android_tools.gyp:android_support_v7_a
ppcompat_javalib', |
| 656 '../third_party/android_tools/android_tools.gyp:android_support_v13_
javalib', | 656 '../third_party/android_tools/android_tools.gyp:android_support_v13_
javalib', |
| 657 '../ui/android/ui_android.gyp:ui_java', | 657 '../ui/android/ui_android.gyp:ui_java', |
| 658 ], | 658 ], |
| 659 'variables': { | 659 'variables': { |
| 660 'java_in_dir': '../chrome/android/java', | 660 'java_in_dir': '../chrome/android/java', |
| 661 'has_java_resources': 1, | 661 'has_java_resources': 1, |
| 662 'R_package': 'org.chromium.chrome', | 662 'R_package': 'org.chromium.chrome', |
| 663 'R_package_relpath': 'org/chromium/chrome', | 663 'R_package_relpath': 'org/chromium/chrome', |
| 664 # Include xml string files generated from generated_resources.grd | 664 # Include xml string files generated from generated_resources.grd |
| 665 'res_extra_dirs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/java/res'], | 665 'res_extra_dirs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/java/res'], |
| 666 'res_extra_files': ['<!@pymod_do_main(grit_info <@(grit_defines) --o
utputs "<(SHARED_INTERMEDIATE_DIR)/chrome" app/generated_resources.grd)'], | 666 'res_extra_files': ['<!@pymod_do_main(grit_info <@(grit_defines) --o
utputs "<(SHARED_INTERMEDIATE_DIR)/chrome" app/generated_resources.grd)'], |
| 667 }, | 667 }, |
| 668 'includes': [ | 668 'includes': [ |
| 669 '../build/java.gypi', | 669 '../build/java.gypi', |
| 670 ], | 670 ], |
| 671 }, | 671 }, |
| 672 { | 672 { |
| 673 # GN: //chrome/android:chrome_strings_grd |
| 673 'target_name': 'chrome_strings_grd', | 674 'target_name': 'chrome_strings_grd', |
| 674 'type': 'none', | 675 'type': 'none', |
| 675 'variables': { | 676 'variables': { |
| 676 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g
rd', | 677 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g
rd', |
| 677 }, | 678 }, |
| 678 'includes': [ | 679 'includes': [ |
| 679 '../build/java_strings_grd.gypi', | 680 '../build/java_strings_grd.gypi', |
| 680 ], | 681 ], |
| 681 }, | 682 }, |
| 682 ], # 'targets' | 683 ], # 'targets' |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 771 'sources': [ | 772 'sources': [ |
| 772 'service/cloud_print/print_system_dummy.cc', | 773 'service/cloud_print/print_system_dummy.cc', |
| 773 ], | 774 ], |
| 774 }], | 775 }], |
| 775 ], | 776 ], |
| 776 }, | 777 }, |
| 777 ], | 778 ], |
| 778 }], | 779 }], |
| 779 ], # 'conditions' | 780 ], # 'conditions' |
| 780 } | 781 } |
| OLD | NEW |