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

Unified Diff: talk/libjingle_tests.gyp

Issue 1691463002: Move talk/session/media -> webrtc/pc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Last rebase Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « talk/libjingle_p2p_unittest.isolate ('k') | talk/session/media/audiomonitor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/libjingle_tests.gyp
diff --git a/talk/libjingle_tests.gyp b/talk/libjingle_tests.gyp
deleted file mode 100755
index f45a99c0252511ba47ad818aae4a4c9df1df1e0b..0000000000000000000000000000000000000000
--- a/talk/libjingle_tests.gyp
+++ /dev/null
@@ -1,149 +0,0 @@
-#
-# libjingle
-# Copyright 2012 Google Inc.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-# derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-{
- 'includes': ['build/common.gypi'],
- 'targets': [
- {
- 'target_name': 'libjingle_p2p_unittest',
- 'type': 'executable',
- 'dependencies': [
- '<(webrtc_root)/api/api.gyp:libjingle_peerconnection',
- '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
- '<(webrtc_root)/webrtc.gyp:rtc_unittest_main',
- 'libjingle.gyp:libjingle_p2p',
- ],
- 'include_dirs': [
- '<(DEPTH)/third_party/libsrtp/srtp',
- ],
- 'sources': [
- 'session/media/bundlefilter_unittest.cc',
- 'session/media/channel_unittest.cc',
- 'session/media/channelmanager_unittest.cc',
- 'session/media/currentspeakermonitor_unittest.cc',
- 'session/media/mediasession_unittest.cc',
- 'session/media/rtcpmuxfilter_unittest.cc',
- 'session/media/srtpfilter_unittest.cc',
- ],
- 'conditions': [
- ['build_libsrtp==1', {
- 'dependencies': [
- '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
- ],
- }],
- ['OS=="win"', {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalDependencies': [
- 'strmiids.lib',
- ],
- },
- },
- }],
- ],
- }, # target libjingle_p2p_unittest
- ],
- 'conditions': [
- ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
- # The >=10.7 above is required to make ARC link cleanly (e.g. as
- # opposed to _compile_ cleanly, which the library under test
- # does just fine on 10.6 too).
- 'targets': [
- {
- 'target_name': 'libjingle_peerconnection_objc_test',
- 'type': 'executable',
- 'includes': [ 'build/objc_app.gypi' ],
- 'dependencies': [
- '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
- '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
- 'libjingle.gyp:libjingle_peerconnection_objc',
- ],
- 'sources': [
- 'app/webrtc/objctests/RTCPeerConnectionSyncObserver.h',
- 'app/webrtc/objctests/RTCPeerConnectionSyncObserver.m',
- 'app/webrtc/objctests/RTCPeerConnectionTest.mm',
- 'app/webrtc/objctests/RTCSessionDescriptionSyncObserver.h',
- 'app/webrtc/objctests/RTCSessionDescriptionSyncObserver.m',
- # TODO(fischman): figure out if this works for ios or if it
- # needs a GUI driver.
- 'app/webrtc/objctests/mac/main.mm',
- ],
- 'conditions': [
- ['OS=="mac"', {
- 'xcode_settings': {
- # Need to build against 10.7 framework for full ARC support
- # on OSX.
- 'MACOSX_DEPLOYMENT_TARGET' : '10.7',
- # common.gypi enables this for mac but we want this to be
- # disabled like it is for ios.
- 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'NO',
- },
- }],
- ],
- }, # target libjingle_peerconnection_objc_test
- {
- 'target_name': 'apprtc_signaling_gunit_test',
- 'type': 'executable',
- 'includes': [ 'build/objc_app.gypi' ],
- 'dependencies': [
- '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
- '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
- '<(webrtc_root)/webrtc_examples.gyp:apprtc_signaling',
- '<(DEPTH)/third_party/ocmock/ocmock.gyp:ocmock',
- ],
- 'sources': [
- 'app/webrtc/objctests/mac/main.mm',
- '<(webrtc_root)/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm',
- ],
- 'conditions': [
- ['OS=="mac"', {
- 'xcode_settings': {
- 'MACOSX_DEPLOYMENT_TARGET' : '10.8',
- },
- }],
- ],
- }, # target apprtc_signaling_gunit_test
- ],
- }],
- ['test_isolation_mode != "noop"', {
- 'targets': [
- {
- 'target_name': 'libjingle_p2p_unittest_run',
- 'type': 'none',
- 'dependencies': [
- 'libjingle_p2p_unittest',
- ],
- 'includes': [
- 'build/isolate.gypi',
- ],
- 'sources': [
- 'libjingle_p2p_unittest.isolate',
- ],
- },
- ],
- }],
- ],
-}
« no previous file with comments | « talk/libjingle_p2p_unittest.isolate ('k') | talk/session/media/audiomonitor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698