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

Side by Side Diff: content/content_shell.gypi

Issue 15421002: Roll DEPS for googleurl. Second try. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome_frame_ie fix Created 7 years, 6 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 | « content/content_common_child.gypi ('k') | content/content_tests.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 { 5 {
6 'variables': { 6 'variables': {
7 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 # The "19" is so that sites that sniff for version think that this is 8 # The "19" is so that sites that sniff for version think that this is
9 # something reasonably current; the "77.34.5" is a hint that this isn't a 9 # something reasonably current; the "77.34.5" is a hint that this isn't a
10 # standard Chrome. 10 # standard Chrome.
(...skipping 23 matching lines...) Expand all
34 'content_plugin', 34 'content_plugin',
35 'content_ppapi_plugin', 35 'content_ppapi_plugin',
36 'content_renderer', 36 'content_renderer',
37 'content_shell_resources', 37 'content_shell_resources',
38 'content_utility', 38 'content_utility',
39 'content_worker', 39 'content_worker',
40 'test_support_content', 40 'test_support_content',
41 'content_resources.gyp:content_resources', 41 'content_resources.gyp:content_resources',
42 '../base/base.gyp:base', 42 '../base/base.gyp:base',
43 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 43 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
44 '../build/temp_gyp/googleurl.gyp:googleurl',
45 '../ipc/ipc.gyp:ipc', 44 '../ipc/ipc.gyp:ipc',
46 '../media/media.gyp:media', 45 '../media/media.gyp:media',
47 '../net/net.gyp:net', 46 '../net/net.gyp:net',
48 '../net/net.gyp:net_resources', 47 '../net/net.gyp:net_resources',
49 '../skia/skia.gyp:skia', 48 '../skia/skia.gyp:skia',
50 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', 49 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
51 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit_test_sup port', 50 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit_test_sup port',
52 '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRende rTree.gyp:TestRunner', 51 '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRende rTree.gyp:TestRunner',
53 '../ui/gl/gl.gyp:gl', 52 '../ui/gl/gl.gyp:gl',
54 '../ui/ui.gyp:ui', 53 '../ui/ui.gyp:ui',
54 '../url/url.gyp:url_lib',
55 '../v8/tools/gyp/v8.gyp:v8', 55 '../v8/tools/gyp/v8.gyp:v8',
56 '../webkit/support/webkit_support.gyp:webkit_resources', 56 '../webkit/support/webkit_support.gyp:webkit_resources',
57 '../webkit/support/webkit_support.gyp:webkit_support', 57 '../webkit/support/webkit_support.gyp:webkit_support',
58 ], 58 ],
59 'include_dirs': [ 59 'include_dirs': [
60 '..', 60 '..',
61 ], 61 ],
62 'sources': [ 62 'sources': [
63 'shell/android/shell_jni_registrar.cc', 63 'shell/android/shell_jni_registrar.cc',
64 'shell/android/shell_jni_registrar.h', 64 'shell/android/shell_jni_registrar.h',
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 'native_lib_target': 'libcontent_shell_content_view', 695 'native_lib_target': 'libcontent_shell_content_view',
696 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 696 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
697 'asset_location': '<(ant_build_out)/content_shell/assets', 697 'asset_location': '<(ant_build_out)/content_shell/assets',
698 }, 698 },
699 'includes': [ '../build/java_apk.gypi' ], 699 'includes': [ '../build/java_apk.gypi' ],
700 }, 700 },
701 ], 701 ],
702 }], # OS=="android" 702 }], # OS=="android"
703 ] 703 ]
704 } 704 }
OLDNEW
« no previous file with comments | « content/content_common_child.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698