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: content/content_shell.gypi

Issue 23526028: Move source files from webkit/support to content/test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm webkit_support.gypi Created 7 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 | « no previous file | content/content_tests.gypi » ('j') | content/content_tests.gypi » ('J')
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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 '../ipc/ipc.gyp:ipc', 44 '../ipc/ipc.gyp:ipc',
45 '../media/media.gyp:media', 45 '../media/media.gyp:media',
46 '../net/net.gyp:net', 46 '../net/net.gyp:net',
47 '../net/net.gyp:net_resources', 47 '../net/net.gyp:net_resources',
48 '../skia/skia.gyp:skia', 48 '../skia/skia.gyp:skia',
49 '../third_party/WebKit/public/blink_test_runner.gyp:blink_test_runner', 49 '../third_party/WebKit/public/blink_test_runner.gyp:blink_test_runner',
50 '../ui/gl/gl.gyp:gl', 50 '../ui/gl/gl.gyp:gl',
51 '../ui/ui.gyp:ui', 51 '../ui/ui.gyp:ui',
52 '../url/url.gyp:url_lib', 52 '../url/url.gyp:url_lib',
53 '../v8/tools/gyp/v8.gyp:v8', 53 '../v8/tools/gyp/v8.gyp:v8',
54 '../webkit/support/webkit_support.gyp:webkit_support', 54 '../webkit/common/webkit_common.gyp:webkit_common',
55 '../webkit/webkit_resources.gyp:webkit_resources', 55 '../webkit/webkit_resources.gyp:webkit_resources',
56 '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
57 '../webkit/support/webkit_support.gyp:glue',
56 ], 58 ],
57 'include_dirs': [ 59 'include_dirs': [
58 '..', 60 '..',
59 ], 61 ],
60 'sources': [ 62 'sources': [
61 'shell/android/shell_jni_registrar.cc', 63 'shell/android/shell_jni_registrar.cc',
62 'shell/android/shell_jni_registrar.h', 64 'shell/android/shell_jni_registrar.h',
63 'shell/android/shell_manager.cc', 65 'shell/android/shell_manager.cc',
64 'shell/android/shell_manager.h', 66 'shell/android/shell_manager.h',
65 'shell/app/paths_mac.h', 67 'shell/app/paths_mac.h',
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 ], 198 ],
197 }], 199 }],
198 ['OS=="android"', { 200 ['OS=="android"', {
199 'dependencies': [ 201 'dependencies': [
200 'content_shell_jni_headers', 202 'content_shell_jni_headers',
201 ], 203 ],
202 }, { # else: OS!="android" 204 }, { # else: OS!="android"
203 'dependencies': [ 205 'dependencies': [
204 # This dependency is for running DRT against the content shell, and 206 # This dependency is for running DRT against the content shell, and
205 # this combination is not yet supported on Android. 207 # this combination is not yet supported on Android.
206 '../webkit/support/webkit_support.gyp:webkit_support', 208 'test_support_content',
207 ], 209 ],
208 }], # OS=="android" 210 }], # OS=="android"
209 ['(os_posix==1 and use_aura==1 and linux_use_tcmalloc==1) or (android_us e_tcmalloc==1)', { 211 ['(os_posix==1 and use_aura==1 and linux_use_tcmalloc==1) or (android_us e_tcmalloc==1)', {
210 'dependencies': [ 212 'dependencies': [
211 # This is needed by content/app/content_main_runner.cc 213 # This is needed by content/app/content_main_runner.cc
212 '../base/allocator/allocator.gyp:allocator', 214 '../base/allocator/allocator.gyp:allocator',
213 ], 215 ],
214 }], 216 }],
215 ['use_aura==1', { 217 ['use_aura==1', {
216 'dependencies': [ 218 'dependencies': [
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 '../tools/imagediff/image_diff.gyp:image_diff#host', 746 '../tools/imagediff/image_diff.gyp:image_diff#host',
745 ], 747 ],
746 }], 748 }],
747 ], 749 ],
748 'includes': [ '../build/java_apk.gypi' ], 750 'includes': [ '../build/java_apk.gypi' ],
749 }, 751 },
750 ], 752 ],
751 }], # OS=="android" 753 }], # OS=="android"
752 ] 754 ]
753 } 755 }
OLDNEW
« no previous file with comments | « no previous file | content/content_tests.gypi » ('j') | content/content_tests.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698