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

Side by Side Diff: chrome/chrome.gyp

Issue 1818423003: Revert of Remove configuration policy from chrome build files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@policy_chrome_defines
Patch Set: Created 4 years, 9 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/browser/ui/BUILD.gn ('k') | chrome/chrome_browser.gypi » ('j') | 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 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 'profile_account_management_metrics_java', 549 'profile_account_management_metrics_java',
550 'resource_id_java', 550 'resource_id_java',
551 'shortcut_source_java', 551 'shortcut_source_java',
552 'signin_metrics_enum_java', 552 'signin_metrics_enum_java',
553 'tab_load_status_java', 553 'tab_load_status_java',
554 'website_settings_action_java', 554 'website_settings_action_java',
555 '../base/base.gyp:base', 555 '../base/base.gyp:base',
556 '../base/base.gyp:base_build_config_gen', 556 '../base/base.gyp:base_build_config_gen',
557 '../build/android/java_google_api_keys.gyp:google_api_keys_java', 557 '../build/android/java_google_api_keys.gyp:google_api_keys_java',
558 '../chrome/android/chrome_apk.gyp:custom_tabs_service_aidl', 558 '../chrome/android/chrome_apk.gyp:custom_tabs_service_aidl',
559 '../components/components.gyp:app_restrictions_resources',
560 '../components/components.gyp:autocomplete_match_java', 559 '../components/components.gyp:autocomplete_match_java',
561 '../components/components.gyp:autocomplete_match_type_java', 560 '../components/components.gyp:autocomplete_match_type_java',
562 '../components/components.gyp:bookmarks_java', 561 '../components/components.gyp:bookmarks_java',
563 '../components/components.gyp:dom_distiller_core_java', 562 '../components/components.gyp:dom_distiller_core_java',
564 '../components/components.gyp:gcm_driver_java', 563 '../components/components.gyp:gcm_driver_java',
565 '../components/components.gyp:infobar_delegate_java', 564 '../components/components.gyp:infobar_delegate_java',
566 '../components/components.gyp:invalidation_java', 565 '../components/components.gyp:invalidation_java',
567 '../components/components.gyp:investigated_scenario_java', 566 '../components/components.gyp:investigated_scenario_java',
568 '../components/components.gyp:navigation_interception_java', 567 '../components/components.gyp:navigation_interception_java',
569 '../components/components.gyp:offline_page_feature_enums_java', 568 '../components/components.gyp:offline_page_feature_enums_java',
570 '../components/components.gyp:offline_page_model_enums_java', 569 '../components/components.gyp:offline_page_model_enums_java',
571 '../components/components.gyp:policy_java',
572 '../components/components.gyp:precache_java', 570 '../components/components.gyp:precache_java',
573 '../components/components.gyp:safe_json_java', 571 '../components/components.gyp:safe_json_java',
574 '../components/components.gyp:security_state_enums_java', 572 '../components/components.gyp:security_state_enums_java',
575 '../components/components.gyp:service_tab_launcher_java', 573 '../components/components.gyp:service_tab_launcher_java',
576 '../components/components.gyp:signin_core_browser_java', 574 '../components/components.gyp:signin_core_browser_java',
577 '../components/components.gyp:variations_java', 575 '../components/components.gyp:variations_java',
578 '../components/components.gyp:web_contents_delegate_android_java', 576 '../components/components.gyp:web_contents_delegate_android_java',
579 '../components/components.gyp:web_restrictions_java', 577 '../components/components.gyp:web_restrictions_java',
580 '../components/components_strings.gyp:components_strings', 578 '../components/components_strings.gyp:components_strings',
581 '../content/content.gyp:content_java', 579 '../content/content.gyp:content_java',
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 'res_extra_dirs': [ 611 'res_extra_dirs': [
614 '<@(android_branding_res_dirs)', 612 '<@(android_branding_res_dirs)',
615 '<(SHARED_INTERMEDIATE_DIR)/chrome/java/res', 613 '<(SHARED_INTERMEDIATE_DIR)/chrome/java/res',
616 '<(SHARED_INTERMEDIATE_DIR)/components/strings/java/res', 614 '<(SHARED_INTERMEDIATE_DIR)/components/strings/java/res',
617 ], 615 ],
618 'res_extra_files': [ 616 'res_extra_files': [
619 '<!@(find <(android_branding_res_dirs) -type f)', 617 '<!@(find <(android_branding_res_dirs) -type f)',
620 '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_I NTERMEDIATE_DIR)/chrome" app/generated_resources.grd)', 618 '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_I NTERMEDIATE_DIR)/chrome" app/generated_resources.grd)',
621 ], 619 ],
622 }, 620 },
621 'conditions': [
622 ['configuration_policy == 1', {
623 'dependencies': [
624 '../components/components.gyp:app_restrictions_resources',
625 '../components/components.gyp:policy_java',
626 ],
627 }],
628 ],
623 'includes': [ 629 'includes': [
624 '../build/java.gypi', 630 '../build/java.gypi',
625 ], 631 ],
626 }, 632 },
627 { 633 {
628 # GN: //chrome/android:chrome_strings_grd 634 # GN: //chrome/android:chrome_strings_grd
629 'target_name': 'chrome_strings_grd', 635 'target_name': 'chrome_strings_grd',
630 'type': 'none', 636 'type': 'none',
631 'variables': { 637 'variables': {
632 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd', 638 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd',
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 'variables': { 706 'variables': {
701 'source_file': 'browser/android/data_usage/data_use_tab_ui_manager_a ndroid.cc', 707 'source_file': 'browser/android/data_usage/data_use_tab_ui_manager_a ndroid.cc',
702 }, 708 },
703 'includes': [ '../build/android/java_cpp_enum.gypi' ], 709 'includes': [ '../build/android/java_cpp_enum.gypi' ],
704 }, 710 },
705 ], # 'targets' 711 ], # 'targets'
706 'includes': [ 712 'includes': [
707 'chrome_android.gypi', 713 'chrome_android.gypi',
708 ]}, # 'includes' 714 ]}, # 'includes'
709 ], # OS=="android" 715 ], # OS=="android"
710 ['OS!="android" and OS!="ios"', { 716 ['configuration_policy==1 and OS!="android" and OS!="ios"', {
711 'includes': [ 'policy.gypi', ], 717 'includes': [ 'policy.gypi', ],
712 }], 718 }],
713 ['enable_extensions==1', { 719 ['enable_extensions==1', {
714 'includes': [ 720 'includes': [
715 'chrome_browser_extensions.gypi', 721 'chrome_browser_extensions.gypi',
716 ], 722 ],
717 }], 723 }],
718 ['enable_print_preview==1', { 724 ['enable_print_preview==1', {
719 'targets': [ 725 'targets': [
720 { 726 {
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
803 # expired. crbug.com/577698 809 # expired. crbug.com/577698
804 '../components/components.gyp:startup_metric_utils_common', 810 '../components/components.gyp:startup_metric_utils_common',
805 ], 811 ],
806 }], 812 }],
807 ], 813 ],
808 }, 814 },
809 ], 815 ],
810 }], 816 }],
811 ], # 'conditions' 817 ], # 'conditions'
812 } 818 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698