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

Side by Side Diff: chrome/chrome.gyp

Issue 1303023002: Use third_party/custom_tabs_client as the src for customtabs library (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
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',
589 '../components/components.gyp:app_restrictions_resources', 588 '../components/components.gyp:app_restrictions_resources',
590 '../components/components.gyp:bookmarks_java', 589 '../components/components.gyp:bookmarks_java',
591 '../components/components.gyp:dom_distiller_core_java', 590 '../components/components.gyp:dom_distiller_core_java',
592 '../components/components.gyp:enhanced_bookmarks_java_enums_srcjar', 591 '../components/components.gyp:enhanced_bookmarks_java_enums_srcjar',
593 '../components/components.gyp:gcm_driver_java', 592 '../components/components.gyp:gcm_driver_java',
594 '../components/components.gyp:invalidation_java', 593 '../components/components.gyp:invalidation_java',
595 '../components/components.gyp:navigation_interception_java', 594 '../components/components.gyp:navigation_interception_java',
596 '../components/components.gyp:offline_pages_enums_java', 595 '../components/components.gyp:offline_pages_enums_java',
597 '../components/components.gyp:policy_java', 596 '../components/components.gyp:policy_java',
598 '../components/components.gyp:precache_java', 597 '../components/components.gyp:precache_java',
(...skipping 10 matching lines...) Expand all
609 '../third_party/android_media/android_media.gyp:android_media_java', 608 '../third_party/android_media/android_media.gyp:android_media_java',
610 '../third_party/android_protobuf/android_protobuf.gyp:protobuf_nano_ javalib', 609 '../third_party/android_protobuf/android_protobuf.gyp:protobuf_nano_ javalib',
611 '../third_party/android_swipe_refresh/android_swipe_refresh.gyp:andr oid_swipe_refresh_java', 610 '../third_party/android_swipe_refresh/android_swipe_refresh.gyp:andr oid_swipe_refresh_java',
612 '../third_party/android_tools/android_tools.gyp:android_support_desi gn_javalib', 611 '../third_party/android_tools/android_tools.gyp:android_support_desi gn_javalib',
613 '../third_party/android_tools/android_tools.gyp:android_support_v7_a ppcompat_javalib', 612 '../third_party/android_tools/android_tools.gyp:android_support_v7_a ppcompat_javalib',
614 '../third_party/android_tools/android_tools.gyp:android_support_v7_m ediarouter_javalib', 613 '../third_party/android_tools/android_tools.gyp:android_support_v7_m ediarouter_javalib',
615 '../third_party/android_tools/android_tools.gyp:android_support_v7_r ecyclerview_javalib', 614 '../third_party/android_tools/android_tools.gyp:android_support_v7_r ecyclerview_javalib',
616 '../third_party/android_tools/android_tools.gyp:android_support_v13_ javalib', 615 '../third_party/android_tools/android_tools.gyp:android_support_v13_ javalib',
617 '../third_party/android_tools/android_tools.gyp:google_play_services _javalib', 616 '../third_party/android_tools/android_tools.gyp:google_play_services _javalib',
618 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_javalib', 617 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_javalib',
618 '../third_party/custom_tabs_client/custom_tabs_client.gyp:custom_tab s_support_lib',
619 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', 619 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
620 '../ui/android/ui_android.gyp:ui_java', 620 '../ui/android/ui_android.gyp:ui_java',
621 ], 621 ],
622 'variables': { 622 'variables': {
623 'variables': { 623 'variables': {
624 'android_branding_res_dirs%': ['<(java_in_dir)/res_chromium'], 624 'android_branding_res_dirs%': ['<(java_in_dir)/res_chromium'],
625 }, 625 },
626 'java_in_dir': '../chrome/android/java', 626 'java_in_dir': '../chrome/android/java',
627 'has_java_resources': 1, 627 'has_java_resources': 1,
628 'R_package': 'org.chromium.chrome', 628 'R_package': 'org.chromium.chrome',
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 '<(DEPTH)/third_party/kasko' 833 '<(DEPTH)/third_party/kasko'
834 ], 834 ],
835 }, 835 },
836 }, 836 },
837 }, 837 },
838 }, 838 },
839 ], 839 ],
840 }], 840 }],
841 ], # 'conditions' 841 ], # 'conditions'
842 } 842 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698