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

Side by Side Diff: chrome/chrome.gyp

Issue 928643003: Upstream Chrome for Android Cast. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing resource, allowing casting from Chrome Shell Created 5 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
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 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 '../components/components.gyp:enhanced_bookmarks_launch_location_src jar', 617 '../components/components.gyp:enhanced_bookmarks_launch_location_src jar',
618 '../components/components.gyp:gcm_driver_java', 618 '../components/components.gyp:gcm_driver_java',
619 '../components/components.gyp:invalidation_java', 619 '../components/components.gyp:invalidation_java',
620 '../components/components.gyp:navigation_interception_java', 620 '../components/components.gyp:navigation_interception_java',
621 '../components/components.gyp:variations_java', 621 '../components/components.gyp:variations_java',
622 '../components/components.gyp:web_contents_delegate_android_java', 622 '../components/components.gyp:web_contents_delegate_android_java',
623 '../content/content.gyp:content_java', 623 '../content/content.gyp:content_java',
624 '../printing/printing.gyp:printing_java', 624 '../printing/printing.gyp:printing_java',
625 '../sync/sync.gyp:sync_java', 625 '../sync/sync.gyp:sync_java',
626 '../third_party/android_data_chart/android_data_chart.gyp:android_da ta_chart_java', 626 '../third_party/android_data_chart/android_data_chart.gyp:android_da ta_chart_java',
627 '../third_party/android_media/android_media.gyp:android_media_java',
627 '../third_party/android_tools/android_tools.gyp:android_support_v7_a ppcompat_javalib', 628 '../third_party/android_tools/android_tools.gyp:android_support_v7_a ppcompat_javalib',
629 '../third_party/android_tools/android_tools.gyp:android_support_v7_m ediarouter_javalib',
628 '../third_party/android_tools/android_tools.gyp:android_support_v13_ javalib', 630 '../third_party/android_tools/android_tools.gyp:android_support_v13_ javalib',
629 '../third_party/android_tools/android_tools.gyp:google_play_services _javalib', 631 '../third_party/android_tools/android_tools.gyp:google_play_services _javalib',
630 '../ui/android/ui_android.gyp:ui_java', 632 '../ui/android/ui_android.gyp:ui_java',
631 ], 633 ],
632 'variables': { 634 'variables': {
633 'java_in_dir': '../chrome/android/java', 635 'java_in_dir': '../chrome/android/java',
634 'has_java_resources': 1, 636 'has_java_resources': 1,
635 'R_package': 'org.chromium.chrome', 637 'R_package': 'org.chromium.chrome',
636 'R_package_relpath': 'org/chromium/chrome', 638 'R_package_relpath': 'org/chromium/chrome',
637 # Include xml string files generated from generated_resources.grd 639 # Include xml string files generated from generated_resources.grd
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 '<(DEPTH)/third_party/kasko' 816 '<(DEPTH)/third_party/kasko'
815 ], 817 ],
816 }, 818 },
817 }, 819 },
818 }, 820 },
819 }, 821 },
820 ], 822 ],
821 }], 823 }],
822 ], # 'conditions' 824 ], # 'conditions'
823 } 825 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698