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

Side by Side Diff: content/content_tests.gypi

Issue 12965010: Split the libpeerconnection target up in two parts. The new target, libjingle_webrtc contains all t… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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
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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 'renderer/media/mock_media_stream_dispatcher.cc', 191 'renderer/media/mock_media_stream_dispatcher.cc',
192 'renderer/media/mock_media_stream_dispatcher.h', 192 'renderer/media/mock_media_stream_dispatcher.h',
193 'renderer/media/mock_peer_connection_impl.cc', 193 'renderer/media/mock_peer_connection_impl.cc',
194 'renderer/media/mock_peer_connection_impl.h', 194 'renderer/media/mock_peer_connection_impl.h',
195 'renderer/media/mock_web_rtc_peer_connection_handler_client.cc', 195 'renderer/media/mock_web_rtc_peer_connection_handler_client.cc',
196 'renderer/media/mock_web_rtc_peer_connection_handler_client.h', 196 'renderer/media/mock_web_rtc_peer_connection_handler_client.h',
197 'test/webrtc_audio_device_test.cc', 197 'test/webrtc_audio_device_test.cc',
198 'test/webrtc_audio_device_test.h', 198 'test/webrtc_audio_device_test.h',
199 ], 199 ],
200 'dependencies': [ 200 'dependencies': [
201 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc',
201 '../third_party/libjingle/libjingle.gyp:libpeerconnection', 202 '../third_party/libjingle/libjingle.gyp:libpeerconnection',
202 '../third_party/webrtc/modules/modules.gyp:audio_device', 203 '../third_party/webrtc/modules/modules.gyp:audio_device',
203 '../third_party/webrtc/modules/modules.gyp:video_capture_module', 204 '../third_party/webrtc/modules/modules.gyp:video_capture_module',
204 ], 205 ],
205 }], 206 }],
206 ['toolkit_uses_gtk == 1', { 207 ['toolkit_uses_gtk == 1', {
207 'dependencies': [ 208 'dependencies': [
208 '../build/linux/system.gyp:gtk', 209 '../build/linux/system.gyp:gtk',
209 ], 210 ],
210 }], 211 }],
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 'browser/renderer_host/p2p/socket_host_tcp_unittest.cc', 568 'browser/renderer_host/p2p/socket_host_tcp_unittest.cc',
568 'browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc', 569 'browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc',
569 'browser/renderer_host/p2p/socket_host_udp_unittest.cc', 570 'browser/renderer_host/p2p/socket_host_udp_unittest.cc',
570 'renderer/media/media_stream_dependency_factory_unittest.cc', 571 'renderer/media/media_stream_dependency_factory_unittest.cc',
571 'renderer/media/media_stream_dispatcher_unittest.cc', 572 'renderer/media/media_stream_dispatcher_unittest.cc',
572 'renderer/media/media_stream_impl_unittest.cc', 573 'renderer/media/media_stream_impl_unittest.cc',
573 'renderer/media/rtc_peer_connection_handler_unittest.cc', 574 'renderer/media/rtc_peer_connection_handler_unittest.cc',
574 'renderer/media/webrtc_audio_device_unittest.cc', 575 'renderer/media/webrtc_audio_device_unittest.cc',
575 ], 576 ],
576 'dependencies': [ 577 'dependencies': [
578 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc',
577 '../third_party/libjingle/libjingle.gyp:libpeerconnection', 579 '../third_party/libjingle/libjingle.gyp:libpeerconnection',
578 '../third_party/webrtc/modules/modules.gyp:video_capture_module', 580 '../third_party/webrtc/modules/modules.gyp:video_capture_module',
579 '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_co re', 581 '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_co re',
580 ] 582 ]
581 }], 583 }],
582 # TODO(jrg): remove the OS=="android" section? 584 # TODO(jrg): remove the OS=="android" section?
583 # http://crbug.com/113172 585 # http://crbug.com/113172
584 # Understand better how media_stream_ is tied into Chromium. 586 # Understand better how media_stream_ is tied into Chromium.
585 ['enable_webrtc==0 and OS=="android"', { 587 ['enable_webrtc==0 and OS=="android"', {
586 'sources/': [ 588 'sources/': [
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 'additional_src_dirs': ['../content/public/android/javatests/',], 1063 'additional_src_dirs': ['../content/public/android/javatests/',],
1062 'resource_dir': '../shell_apk/res', 1064 'resource_dir': '../shell_apk/res',
1063 'is_test_apk': 1, 1065 'is_test_apk': 1,
1064 }, 1066 },
1065 'includes': [ '../build/java_apk.gypi' ], 1067 'includes': [ '../build/java_apk.gypi' ],
1066 }, 1068 },
1067 ], 1069 ],
1068 }], 1070 }],
1069 ], 1071 ],
1070 } 1072 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698