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

Side by Side Diff: chrome/chrome.gyp

Issue 1285313003: [Offline pages] Wiring saving and opening offline page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address more feeback for Filip Created 5 years, 4 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/android/offline_pages/offline_page_bridge.cc ('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 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 }, 558 },
559 ]}, # 'targets' 559 ]}, # 'targets'
560 ], # OS=="win" and target_arch=="ia32" 560 ], # OS=="win" and target_arch=="ia32"
561 ['chromeos==1', { 561 ['chromeos==1', {
562 'includes': [ 'chrome_browser_chromeos.gypi' ], 562 'includes': [ 'chrome_browser_chromeos.gypi' ],
563 }], # chromeos==1 563 }], # chromeos==1
564 ['OS=="android"', 564 ['OS=="android"',
565 { 565 {
566 'targets': [ 566 'targets': [
567 { 567 {
568 # GN: //chrome/android:chrome_java 568 # GN: //chrome/android:chrome_java
sky 2015/08/14 21:09:05 Do you need to update gn too?
569 'target_name': 'chrome_java', 569 'target_name': 'chrome_java',
570 'type': 'none', 570 'type': 'none',
571 'dependencies': [ 571 'dependencies': [
572 'activity_type_ids_java', 572 'activity_type_ids_java',
573 'chrome_locale_paks', 573 'chrome_locale_paks',
574 'chrome_resources.gyp:chrome_strings', 574 'chrome_resources.gyp:chrome_strings',
575 'chrome_strings_grd', 575 'chrome_strings_grd',
576 'chrome_version_java', 576 'chrome_version_java',
577 'connection_security_security_levels_java', 577 'connection_security_security_levels_java',
578 'connectivity_check_result_java', 578 'connectivity_check_result_java',
579 'document_tab_model_info_proto_java', 579 'document_tab_model_info_proto_java',
580 'profile_account_management_metrics_java', 580 'profile_account_management_metrics_java',
581 'content_setting_java', 581 'content_setting_java',
582 'content_settings_type_java', 582 'content_settings_type_java',
583 'page_info_connection_type_java', 583 'page_info_connection_type_java',
584 'resource_id_java', 584 'resource_id_java',
585 'tab_load_status_java', 585 'tab_load_status_java',
586 'shortcut_source_java', 586 'shortcut_source_java',
587 '../base/base.gyp:base', 587 '../base/base.gyp:base',
588 '../chrome/android/chrome_apk.gyp:custom_tabs_service_aidl', 588 '../chrome/android/chrome_apk.gyp:custom_tabs_service_aidl',
589 '../components/components.gyp:app_restrictions_resources', 589 '../components/components.gyp:app_restrictions_resources',
590 '../components/components.gyp:bookmarks_java', 590 '../components/components.gyp:bookmarks_java',
591 '../components/components.gyp:dom_distiller_core_java', 591 '../components/components.gyp:dom_distiller_core_java',
592 '../components/components.gyp:enhanced_bookmarks_java_enums_srcjar', 592 '../components/components.gyp:enhanced_bookmarks_java_enums_srcjar',
593 '../components/components.gyp:gcm_driver_java', 593 '../components/components.gyp:gcm_driver_java',
594 '../components/components.gyp:invalidation_java', 594 '../components/components.gyp:invalidation_java',
595 '../components/components.gyp:navigation_interception_java', 595 '../components/components.gyp:navigation_interception_java',
596 '../components/components.gyp:offline_pages_enums_java',
596 '../components/components.gyp:policy_java', 597 '../components/components.gyp:policy_java',
597 '../components/components.gyp:precache_java', 598 '../components/components.gyp:precache_java',
598 '../components/components.gyp:safe_json_java', 599 '../components/components.gyp:safe_json_java',
599 '../components/components.gyp:service_tab_launcher_java', 600 '../components/components.gyp:service_tab_launcher_java',
600 '../components/components.gyp:signin_core_browser_java', 601 '../components/components.gyp:signin_core_browser_java',
601 '../components/components.gyp:variations_java', 602 '../components/components.gyp:variations_java',
602 '../components/components.gyp:web_contents_delegate_android_java', 603 '../components/components.gyp:web_contents_delegate_android_java',
603 '../content/content.gyp:content_java', 604 '../content/content.gyp:content_java',
604 '../media/media.gyp:media_java', 605 '../media/media.gyp:media_java',
605 '../printing/printing.gyp:printing_java', 606 '../printing/printing.gyp:printing_java',
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 '<(DEPTH)/third_party/kasko' 832 '<(DEPTH)/third_party/kasko'
832 ], 833 ],
833 }, 834 },
834 }, 835 },
835 }, 836 },
836 }, 837 },
837 ], 838 ],
838 }], 839 }],
839 ], # 'conditions' 840 ], # 'conditions'
840 } 841 }
OLDNEW
« no previous file with comments | « chrome/browser/android/offline_pages/offline_page_bridge.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698