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

Side by Side Diff: chrome/chrome.gyp

Issue 1334253002: Fix running gyp with configuration_policy=0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: History rewrite Created 5 years, 3 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 | « no previous file | components/components_tests.gyp » ('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 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 'infobar_action_type_java', 581 'infobar_action_type_java',
582 'profile_account_management_metrics_java', 582 'profile_account_management_metrics_java',
583 'content_setting_java', 583 'content_setting_java',
584 'content_settings_type_java', 584 'content_settings_type_java',
585 'page_info_connection_type_java', 585 'page_info_connection_type_java',
586 'resource_id_java', 586 'resource_id_java',
587 'tab_load_status_java', 587 'tab_load_status_java',
588 'shortcut_source_java', 588 'shortcut_source_java',
589 '../base/base.gyp:base', 589 '../base/base.gyp:base',
590 '../chrome/android/chrome_apk.gyp:custom_tabs_service_aidl', 590 '../chrome/android/chrome_apk.gyp:custom_tabs_service_aidl',
591 '../components/components.gyp:app_restrictions_resources',
592 '../components/components.gyp:bookmarks_java', 591 '../components/components.gyp:bookmarks_java',
593 '../components/components.gyp:dom_distiller_core_java', 592 '../components/components.gyp:dom_distiller_core_java',
594 '../components/components.gyp:enhanced_bookmarks_java_enums_srcjar', 593 '../components/components.gyp:enhanced_bookmarks_java_enums_srcjar',
595 '../components/components.gyp:gcm_driver_java', 594 '../components/components.gyp:gcm_driver_java',
596 '../components/components.gyp:invalidation_java', 595 '../components/components.gyp:invalidation_java',
597 '../components/components.gyp:navigation_interception_java', 596 '../components/components.gyp:navigation_interception_java',
598 '../components/components.gyp:offline_pages_enums_java', 597 '../components/components.gyp:offline_pages_enums_java',
599 '../components/components.gyp:policy_java',
600 '../components/components.gyp:precache_java', 598 '../components/components.gyp:precache_java',
601 '../components/components.gyp:safe_json_java', 599 '../components/components.gyp:safe_json_java',
602 '../components/components.gyp:service_tab_launcher_java', 600 '../components/components.gyp:service_tab_launcher_java',
603 '../components/components.gyp:signin_core_browser_java', 601 '../components/components.gyp:signin_core_browser_java',
604 '../components/components.gyp:variations_java', 602 '../components/components.gyp:variations_java',
605 '../components/components.gyp:web_contents_delegate_android_java', 603 '../components/components.gyp:web_contents_delegate_android_java',
606 '../content/content.gyp:content_java', 604 '../content/content.gyp:content_java',
607 '../media/media.gyp:media_java', 605 '../media/media.gyp:media_java',
608 '../printing/printing.gyp:printing_java', 606 '../printing/printing.gyp:printing_java',
609 '../sync/sync.gyp:sync_java', 607 '../sync/sync.gyp:sync_java',
(...skipping 24 matching lines...) Expand all
634 'res_extra_dirs': [ 632 'res_extra_dirs': [
635 '<@(android_branding_res_dirs)', 633 '<@(android_branding_res_dirs)',
636 '<(SHARED_INTERMEDIATE_DIR)/chrome/java/res', 634 '<(SHARED_INTERMEDIATE_DIR)/chrome/java/res',
637 ], 635 ],
638 'res_extra_files': [ 636 'res_extra_files': [
639 '<!@(find <(android_branding_res_dirs) -type f)', 637 '<!@(find <(android_branding_res_dirs) -type f)',
640 '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_I NTERMEDIATE_DIR)/chrome" app/generated_resources.grd)', 638 '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_I NTERMEDIATE_DIR)/chrome" app/generated_resources.grd)',
641 ], 639 ],
642 }, 640 },
643 'conditions': [ 641 'conditions': [
644 ['configuration_policy != 1', { 642 ['configuration_policy == 1', {
645 'dependencies!': [ 643 'dependencies': [
646 '../components/components.gyp:app_restrictions_resources', 644 '../components/components.gyp:app_restrictions_resources',
645 '../components/components.gyp:policy_java',
647 ], 646 ],
648 }], 647 }],
649 ], 648 ],
650 'includes': [ 649 'includes': [
651 '../build/java.gypi', 650 '../build/java.gypi',
652 ], 651 ],
653 }, 652 },
654 { 653 {
655 # GN: //chrome/android:chrome_strings_grd 654 # GN: //chrome/android:chrome_strings_grd
656 'target_name': 'chrome_strings_grd', 655 'target_name': 'chrome_strings_grd',
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 '<(DEPTH)/third_party/kasko' 835 '<(DEPTH)/third_party/kasko'
837 ], 836 ],
838 }, 837 },
839 }, 838 },
840 }, 839 },
841 }, 840 },
842 ], 841 ],
843 }], 842 }],
844 ], # 'conditions' 843 ], # 'conditions'
845 } 844 }
OLDNEW
« no previous file with comments | « no previous file | components/components_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698