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

Side by Side Diff: content/content_tests.gypi

Issue 11230022: webkit: Merge build target 'appcache' to 'webkit_storage' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: _ Created 8 years, 1 month 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.gypi ('k') | webkit/appcache/appcache.h » ('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 '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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 ], 159 ],
160 }, { # OS != "ios" 160 }, { # OS != "ios"
161 'dependencies': [ 161 'dependencies': [
162 '../ppapi/ppapi_internal.gyp:ppapi_host', 162 '../ppapi/ppapi_internal.gyp:ppapi_host',
163 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 163 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
164 '../ppapi/ppapi_internal.gyp:ppapi_shared', 164 '../ppapi/ppapi_internal.gyp:ppapi_shared',
165 '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', 165 '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
166 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 166 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
167 '../ui/surface/surface.gyp:surface', 167 '../ui/surface/surface.gyp:surface',
168 '../webkit/compositor_bindings/compositor_bindings.gyp:webkit_compos itor_support', 168 '../webkit/compositor_bindings/compositor_bindings.gyp:webkit_compos itor_support',
169 '../webkit/support/webkit_support.gyp:appcache', 169 '../webkit/support/webkit_support.gyp:webkit_storage',
170 ], 170 ],
171 }], 171 }],
172 ['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', { 172 ['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', {
173 'dependencies': [ 173 'dependencies': [
174 '../sandbox/sandbox.gyp:sandbox', 174 '../sandbox/sandbox.gyp:sandbox',
175 ], 175 ],
176 }], 176 }],
177 ['enable_webrtc==1', { 177 ['enable_webrtc==1', {
178 'sources': [ 178 'sources': [
179 'renderer/media/mock_media_stream_dependency_factory.cc', 179 'renderer/media/mock_media_stream_dependency_factory.cc',
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', 488 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
489 '../gpu/gpu.gyp:gpu_unittest_utils', 489 '../gpu/gpu.gyp:gpu_unittest_utils',
490 '../ipc/ipc.gyp:test_support_ipc', 490 '../ipc/ipc.gyp:test_support_ipc',
491 '../jingle/jingle.gyp:jingle_glue_test_util', 491 '../jingle/jingle.gyp:jingle_glue_test_util',
492 '../media/media.gyp:shared_memory_support', 492 '../media/media.gyp:shared_memory_support',
493 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 493 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
494 '../third_party/libjingle/libjingle.gyp:libjingle', 494 '../third_party/libjingle/libjingle.gyp:libjingle',
495 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 495 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
496 '../ui/gl/gl.gyp:gl', 496 '../ui/gl/gl.gyp:gl',
497 '../v8/tools/gyp/v8.gyp:v8', 497 '../v8/tools/gyp/v8.gyp:v8',
498 '../webkit/support/webkit_support.gyp:appcache',
499 '../webkit/support/webkit_support.gyp:database', 498 '../webkit/support/webkit_support.gyp:database',
500 '../webkit/support/webkit_support.gyp:dom_storage', 499 '../webkit/support/webkit_support.gyp:dom_storage',
501 '../webkit/support/webkit_support.gyp:glue', 500 '../webkit/support/webkit_support.gyp:glue',
502 '../webkit/support/webkit_support.gyp:quota', 501 '../webkit/support/webkit_support.gyp:quota',
503 '../webkit/support/webkit_support.gyp:webkit_base', 502 '../webkit/support/webkit_support.gyp:webkit_base',
504 '../webkit/support/webkit_support.gyp:webkit_media', 503 '../webkit/support/webkit_support.gyp:webkit_media',
505 '../webkit/support/webkit_support.gyp:webkit_storage', 504 '../webkit/support/webkit_support.gyp:webkit_storage',
506 '../webkit/webkit.gyp:test_shell_test_support', 505 '../webkit/webkit.gyp:test_shell_test_support',
507 ], 506 ],
508 }], 507 }],
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
923 'java_in_dir': '../content/shell/android/javatests', 922 'java_in_dir': '../content/shell/android/javatests',
924 'resource_dir': '../res', 923 'resource_dir': '../res',
925 'additional_src_dirs': ['../content/public/android/javatests/'], 924 'additional_src_dirs': ['../content/public/android/javatests/'],
926 }, 925 },
927 'includes': [ '../build/java_apk.gypi' ], 926 'includes': [ '../build/java_apk.gypi' ],
928 }, 927 },
929 ], 928 ],
930 }], 929 }],
931 ], 930 ],
932 } 931 }
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | webkit/appcache/appcache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698