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

Side by Side Diff: chrome/chrome.gyp

Issue 489053003: Use content URI to upload photos taken by camera (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add thread check Created 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/android/shell/res/xml/file_paths.xml ('k') | remoting/remoting_android.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 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 '../components/components.gyp:enhanced_bookmarks_java', 646 '../components/components.gyp:enhanced_bookmarks_java',
647 '../components/components.gyp:gcm_driver_java', 647 '../components/components.gyp:gcm_driver_java',
648 '../components/components.gyp:navigation_interception_java', 648 '../components/components.gyp:navigation_interception_java',
649 '../components/components.gyp:sessions', 649 '../components/components.gyp:sessions',
650 '../components/components.gyp:variations_java', 650 '../components/components.gyp:variations_java',
651 '../components/components.gyp:web_contents_delegate_android_java', 651 '../components/components.gyp:web_contents_delegate_android_java',
652 '../content/content.gyp:content_java', 652 '../content/content.gyp:content_java',
653 '../printing/printing.gyp:printing_java', 653 '../printing/printing.gyp:printing_java',
654 '../sync/sync.gyp:sync_java', 654 '../sync/sync.gyp:sync_java',
655 '../third_party/android_tools/android_tools.gyp:android_support_v7_a ppcompat_javalib', 655 '../third_party/android_tools/android_tools.gyp:android_support_v7_a ppcompat_javalib',
656 '../third_party/android_tools/android_tools.gyp:android_support_v13_ javalib',
656 '../third_party/guava/guava.gyp:guava_javalib', 657 '../third_party/guava/guava.gyp:guava_javalib',
657 '../ui/android/ui_android.gyp:ui_java', 658 '../ui/android/ui_android.gyp:ui_java',
658 ], 659 ],
659 'variables': { 660 'variables': {
660 'java_in_dir': '../chrome/android/java', 661 'java_in_dir': '../chrome/android/java',
661 'has_java_resources': 1, 662 'has_java_resources': 1,
662 'R_package': 'org.chromium.chrome', 663 'R_package': 'org.chromium.chrome',
663 'R_package_relpath': 'org/chromium/chrome', 664 'R_package_relpath': 'org/chromium/chrome',
664 # Include xml string files generated from generated_resources.grd 665 # Include xml string files generated from generated_resources.grd
665 'res_extra_dirs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/java/res'], 666 'res_extra_dirs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/java/res'],
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 'sources': [ 772 'sources': [
772 'service/cloud_print/print_system_dummy.cc', 773 'service/cloud_print/print_system_dummy.cc',
773 ], 774 ],
774 }], 775 }],
775 ], 776 ],
776 }, 777 },
777 ], 778 ],
778 }], 779 }],
779 ], # 'conditions' 780 ], # 'conditions'
780 } 781 }
OLDNEW
« no previous file with comments | « chrome/android/shell/res/xml/file_paths.xml ('k') | remoting/remoting_android.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698