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

Side by Side Diff: content/content_tests.gypi

Issue 12211079: test_support_content requires webkit_support_common, add the dependency explictely (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | no next file » | 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'defines!': ['CONTENT_IMPLEMENTATION'], 10 'defines!': ['CONTENT_IMPLEMENTATION'],
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 'content_worker', 166 'content_worker',
167 '../ppapi/ppapi_internal.gyp:ppapi_host', 167 '../ppapi/ppapi_internal.gyp:ppapi_host',
168 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 168 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
169 '../ppapi/ppapi_internal.gyp:ppapi_shared', 169 '../ppapi/ppapi_internal.gyp:ppapi_shared',
170 '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', 170 '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
171 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 171 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
172 '<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRende rTree.gyp:TestRunner', 172 '<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRende rTree.gyp:TestRunner',
173 '../ui/surface/surface.gyp:surface', 173 '../ui/surface/surface.gyp:surface',
174 '../webkit/compositor_bindings/compositor_bindings.gyp:webkit_compos itor_support', 174 '../webkit/compositor_bindings/compositor_bindings.gyp:webkit_compos itor_support',
175 '../webkit/support/webkit_support.gyp:webkit_storage', 175 '../webkit/support/webkit_support.gyp:webkit_storage',
176 '../webkit/support/webkit_support.gyp:webkit_support_common',
176 ], 177 ],
177 }], 178 }],
178 ['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', { 179 ['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', {
179 'dependencies': [ 180 'dependencies': [
180 '../sandbox/sandbox.gyp:sandbox', 181 '../sandbox/sandbox.gyp:sandbox',
181 ], 182 ],
182 }], 183 }],
183 ['enable_webrtc==1', { 184 ['enable_webrtc==1', {
184 'sources': [ 185 'sources': [
185 'renderer/media/mock_media_stream_dependency_factory.cc', 186 'renderer/media/mock_media_stream_dependency_factory.cc',
(...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after
1043 'additional_src_dirs': ['../content/public/android/javatests/',], 1044 'additional_src_dirs': ['../content/public/android/javatests/',],
1044 'resource_dir': '../shell_apk/res', 1045 'resource_dir': '../shell_apk/res',
1045 'is_test_apk': 1, 1046 'is_test_apk': 1,
1046 }, 1047 },
1047 'includes': [ '../build/java_apk.gypi' ], 1048 'includes': [ '../build/java_apk.gypi' ],
1048 }, 1049 },
1049 ], 1050 ],
1050 }], 1051 }],
1051 ], 1052 ],
1052 } 1053 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698