| 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 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 'content_setting_java', | 540 'content_setting_java', |
| 541 'content_settings_type_java', | 541 'content_settings_type_java', |
| 542 'connectivity_check_result_java', | 542 'connectivity_check_result_java', |
| 543 'document_tab_model_info_proto_java', | 543 'document_tab_model_info_proto_java', |
| 544 'infobar_action_type_java', | 544 'infobar_action_type_java', |
| 545 'most_visited_tile_type_java', | 545 'most_visited_tile_type_java', |
| 546 'page_info_connection_type_java', | 546 'page_info_connection_type_java', |
| 547 'profile_account_management_metrics_java', | 547 'profile_account_management_metrics_java', |
| 548 'resource_id_java', | 548 'resource_id_java', |
| 549 'shortcut_source_java', | 549 'shortcut_source_java', |
| 550 'signin_metrics_enum_java', |
| 550 'tab_load_status_java', | 551 'tab_load_status_java', |
| 551 '../base/base.gyp:base', | 552 '../base/base.gyp:base', |
| 552 '../build/android/java_google_api_keys.gyp:google_api_keys_java', | 553 '../build/android/java_google_api_keys.gyp:google_api_keys_java', |
| 553 '../chrome/android/chrome_apk.gyp:custom_tabs_service_aidl', | 554 '../chrome/android/chrome_apk.gyp:custom_tabs_service_aidl', |
| 554 '../components/components.gyp:autocomplete_match_java', | 555 '../components/components.gyp:autocomplete_match_java', |
| 555 '../components/components.gyp:autocomplete_match_type_java', | 556 '../components/components.gyp:autocomplete_match_type_java', |
| 556 '../components/components.gyp:bookmarks_java', | 557 '../components/components.gyp:bookmarks_java', |
| 557 '../components/components.gyp:dom_distiller_core_java', | 558 '../components/components.gyp:dom_distiller_core_java', |
| 558 '../components/components.gyp:enhanced_bookmarks_java_enums_srcjar', | 559 '../components/components.gyp:enhanced_bookmarks_java_enums_srcjar', |
| 559 '../components/components.gyp:gcm_driver_java', | 560 '../components/components.gyp:gcm_driver_java', |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 666 }, | 667 }, |
| 667 { | 668 { |
| 668 # GN: //chrome:page_info_connection_type_javagen | 669 # GN: //chrome:page_info_connection_type_javagen |
| 669 'target_name': 'page_info_connection_type_java', | 670 'target_name': 'page_info_connection_type_java', |
| 670 'type': 'none', | 671 'type': 'none', |
| 671 'variables': { | 672 'variables': { |
| 672 'source_file': 'browser/ui/android/website_settings_popup_android.h'
, | 673 'source_file': 'browser/ui/android/website_settings_popup_android.h'
, |
| 673 }, | 674 }, |
| 674 'includes': [ '../build/android/java_cpp_enum.gypi' ], | 675 'includes': [ '../build/android/java_cpp_enum.gypi' ], |
| 675 }, | 676 }, |
| 677 { |
| 678 # GN: //chrome:signin_metrics_enum_javagen |
| 679 'target_name': 'signin_metrics_enum_java', |
| 680 'type': 'none', |
| 681 'variables': { |
| 682 'source_file': '../components/signin/core/browser/signin_metrics.h', |
| 683 }, |
| 684 'includes': [ '../build/android/java_cpp_enum.gypi' ], |
| 685 }, |
| 676 ], # 'targets' | 686 ], # 'targets' |
| 677 'includes': [ | 687 'includes': [ |
| 678 'chrome_android.gypi', | 688 'chrome_android.gypi', |
| 679 ]}, # 'includes' | 689 ]}, # 'includes' |
| 680 ], # OS=="android" | 690 ], # OS=="android" |
| 681 ['configuration_policy==1 and OS!="android" and OS!="ios"', { | 691 ['configuration_policy==1 and OS!="android" and OS!="ios"', { |
| 682 'includes': [ 'policy.gypi', ], | 692 'includes': [ 'policy.gypi', ], |
| 683 }], | 693 }], |
| 684 ['enable_extensions==1', { | 694 ['enable_extensions==1', { |
| 685 'includes': [ | 695 'includes': [ |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 774 # expired. crbug.com/577698 | 784 # expired. crbug.com/577698 |
| 775 '../components/components.gyp:startup_metric_utils_common', | 785 '../components/components.gyp:startup_metric_utils_common', |
| 776 ], | 786 ], |
| 777 }], | 787 }], |
| 778 ], | 788 ], |
| 779 }, | 789 }, |
| 780 ], | 790 ], |
| 781 }], | 791 }], |
| 782 ], # 'conditions' | 792 ], # 'conditions' |
| 783 } | 793 } |
| OLD | NEW |