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

Side by Side Diff: content/content_tests.gypi

Issue 10837350: Revert 152406 - Introduce shared_memory_support media target for PPAPI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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.gypi ('k') | media/audio/audio_output_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 'test_support_content', 209 'test_support_content',
210 'browser/speech/proto/speech_proto.gyp:speech_proto', 210 'browser/speech/proto/speech_proto.gyp:speech_proto',
211 'content_resources.gyp:content_resources', 211 'content_resources.gyp:content_resources',
212 '../base/base.gyp:test_support_base', 212 '../base/base.gyp:test_support_base',
213 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 213 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
214 '../crypto/crypto.gyp:crypto', 214 '../crypto/crypto.gyp:crypto',
215 '../gpu/gpu.gyp:gpu_unittest_utils', 215 '../gpu/gpu.gyp:gpu_unittest_utils',
216 '../ipc/ipc.gyp:test_support_ipc', 216 '../ipc/ipc.gyp:test_support_ipc',
217 '../jingle/jingle.gyp:jingle_glue_test_util', 217 '../jingle/jingle.gyp:jingle_glue_test_util',
218 '../media/media.gyp:media_test_support', 218 '../media/media.gyp:media_test_support',
219 '../media/media.gyp:shared_memory_support',
220 '../net/net.gyp:net_test_support', 219 '../net/net.gyp:net_test_support',
221 '../skia/skia.gyp:skia', 220 '../skia/skia.gyp:skia',
222 '../testing/gmock.gyp:gmock', 221 '../testing/gmock.gyp:gmock',
223 '../testing/gtest.gyp:gtest', 222 '../testing/gtest.gyp:gtest',
224 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 223 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
225 '../third_party/libjingle/libjingle.gyp:libjingle', 224 '../third_party/libjingle/libjingle.gyp:libjingle',
226 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 225 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
227 '../ui/gl/gl.gyp:gl', 226 '../ui/gl/gl.gyp:gl',
228 '../ui/ui.gyp:ui', 227 '../ui/ui.gyp:ui',
229 '../v8/tools/gyp/v8.gyp:v8', 228 '../v8/tools/gyp/v8.gyp:v8',
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 '-buildfile', 835 '-buildfile',
837 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk .xml', 836 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk .xml',
838 ] 837 ]
839 } 838 }
840 ], 839 ],
841 }, 840 },
842 ], 841 ],
843 }], 842 }],
844 ], 843 ],
845 } 844 }
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | media/audio/audio_output_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698