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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: talk/libjingle.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/build/merge_ios_libs.gyp ('k') | talk/libjingle_p2p_unittest.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/libjingle.gyp
diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp
deleted file mode 100755
index 09daed7f1712100a11cdef4a70fdcbabdcc68dc8..0000000000000000000000000000000000000000
--- a/talk/libjingle.gyp
+++ /dev/null
@@ -1,244 +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'],
- 'conditions': [
- ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
- # The >= 10.7 above is required for ARC.
- 'targets': [
- {
- 'target_name': 'libjingle_peerconnection_objc',
- 'type': 'static_library',
- 'dependencies': [
- '<(webrtc_root)/api/api.gyp:libjingle_peerconnection',
- ],
- 'sources': [
- 'app/webrtc/objc/RTCAudioTrack+Internal.h',
- 'app/webrtc/objc/RTCAudioTrack.mm',
- 'app/webrtc/objc/RTCDataChannel+Internal.h',
- 'app/webrtc/objc/RTCDataChannel.mm',
- 'app/webrtc/objc/RTCEnumConverter.h',
- 'app/webrtc/objc/RTCEnumConverter.mm',
- 'app/webrtc/objc/RTCFileLogger.mm',
- 'app/webrtc/objc/RTCI420Frame+Internal.h',
- 'app/webrtc/objc/RTCI420Frame.mm',
- 'app/webrtc/objc/RTCICECandidate+Internal.h',
- 'app/webrtc/objc/RTCICECandidate.mm',
- 'app/webrtc/objc/RTCICEServer+Internal.h',
- 'app/webrtc/objc/RTCICEServer.mm',
- 'app/webrtc/objc/RTCLogging.mm',
- 'app/webrtc/objc/RTCMediaConstraints+Internal.h',
- 'app/webrtc/objc/RTCMediaConstraints.mm',
- 'app/webrtc/objc/RTCMediaConstraintsNative.cc',
- 'app/webrtc/objc/RTCMediaConstraintsNative.h',
- 'app/webrtc/objc/RTCMediaSource+Internal.h',
- 'app/webrtc/objc/RTCMediaSource.mm',
- 'app/webrtc/objc/RTCMediaStream+Internal.h',
- 'app/webrtc/objc/RTCMediaStream.mm',
- 'app/webrtc/objc/RTCMediaStreamTrack+Internal.h',
- 'app/webrtc/objc/RTCMediaStreamTrack.mm',
- 'app/webrtc/objc/RTCOpenGLVideoRenderer.mm',
- 'app/webrtc/objc/RTCPair.m',
- 'app/webrtc/objc/RTCPeerConnection+Internal.h',
- 'app/webrtc/objc/RTCPeerConnection.mm',
- 'app/webrtc/objc/RTCPeerConnectionFactory.mm',
- 'app/webrtc/objc/RTCPeerConnectionInterface+Internal.h',
- 'app/webrtc/objc/RTCPeerConnectionInterface.mm',
- 'app/webrtc/objc/RTCPeerConnectionObserver.h',
- 'app/webrtc/objc/RTCPeerConnectionObserver.mm',
- 'app/webrtc/objc/RTCSessionDescription+Internal.h',
- 'app/webrtc/objc/RTCSessionDescription.mm',
- 'app/webrtc/objc/RTCStatsReport+Internal.h',
- 'app/webrtc/objc/RTCStatsReport.mm',
- 'app/webrtc/objc/RTCVideoCapturer+Internal.h',
- 'app/webrtc/objc/RTCVideoCapturer.mm',
- 'app/webrtc/objc/RTCVideoRendererAdapter.h',
- 'app/webrtc/objc/RTCVideoRendererAdapter.mm',
- 'app/webrtc/objc/RTCVideoSource+Internal.h',
- 'app/webrtc/objc/RTCVideoSource.mm',
- 'app/webrtc/objc/RTCVideoTrack+Internal.h',
- 'app/webrtc/objc/RTCVideoTrack.mm',
- 'app/webrtc/objc/public/RTCAudioSource.h',
- 'app/webrtc/objc/public/RTCAudioTrack.h',
- 'app/webrtc/objc/public/RTCDataChannel.h',
- 'app/webrtc/objc/public/RTCFileLogger.h',
- 'app/webrtc/objc/public/RTCI420Frame.h',
- 'app/webrtc/objc/public/RTCICECandidate.h',
- 'app/webrtc/objc/public/RTCICEServer.h',
- 'app/webrtc/objc/public/RTCLogging.h',
- 'app/webrtc/objc/public/RTCMediaConstraints.h',
- 'app/webrtc/objc/public/RTCMediaSource.h',
- 'app/webrtc/objc/public/RTCMediaStream.h',
- 'app/webrtc/objc/public/RTCMediaStreamTrack.h',
- 'app/webrtc/objc/public/RTCOpenGLVideoRenderer.h',
- 'app/webrtc/objc/public/RTCPair.h',
- 'app/webrtc/objc/public/RTCPeerConnection.h',
- 'app/webrtc/objc/public/RTCPeerConnectionDelegate.h',
- 'app/webrtc/objc/public/RTCPeerConnectionFactory.h',
- 'app/webrtc/objc/public/RTCPeerConnectionInterface.h',
- 'app/webrtc/objc/public/RTCSessionDescription.h',
- 'app/webrtc/objc/public/RTCSessionDescriptionDelegate.h',
- 'app/webrtc/objc/public/RTCStatsDelegate.h',
- 'app/webrtc/objc/public/RTCStatsReport.h',
- 'app/webrtc/objc/public/RTCTypes.h',
- 'app/webrtc/objc/public/RTCVideoCapturer.h',
- 'app/webrtc/objc/public/RTCVideoRenderer.h',
- 'app/webrtc/objc/public/RTCVideoSource.h',
- 'app/webrtc/objc/public/RTCVideoTrack.h',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(DEPTH)/talk/app/webrtc/objc/public',
- ],
- },
- 'include_dirs': [
- '<(webrtc_root)/webrtc/api',
- '<(DEPTH)/talk/app/webrtc/objc',
- '<(DEPTH)/talk/app/webrtc/objc/public',
- ],
- 'link_settings': {
- 'libraries': [
- '-lstdc++',
- ],
- },
- 'all_dependent_settings': {
- 'xcode_settings': {
- 'CLANG_ENABLE_OBJC_ARC': 'YES',
- },
- },
- 'xcode_settings': {
- 'CLANG_ENABLE_OBJC_ARC': 'YES',
- # 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',
- # Disabled due to failing when compiled with -Wall, see
- # https://bugs.chromium.org/p/webrtc/issues/detail?id=5397
- 'WARNING_CFLAGS': ['-Wno-unused-property-ivar'],
- },
- 'conditions': [
- ['OS=="ios"', {
- 'sources': [
- 'app/webrtc/objc/avfoundationvideocapturer.h',
- 'app/webrtc/objc/avfoundationvideocapturer.mm',
- 'app/webrtc/objc/RTCAVFoundationVideoSource+Internal.h',
- 'app/webrtc/objc/RTCAVFoundationVideoSource.mm',
- 'app/webrtc/objc/RTCEAGLVideoView.m',
- 'app/webrtc/objc/public/RTCEAGLVideoView.h',
- 'app/webrtc/objc/public/RTCAVFoundationVideoSource.h',
- ],
- 'dependencies': [
- '<(webrtc_root)/base/base.gyp:rtc_base_objc',
- ],
- 'link_settings': {
- 'xcode_settings': {
- 'OTHER_LDFLAGS': [
- '-framework CoreGraphics',
- '-framework GLKit',
- ],
- },
- },
- }],
- ['OS=="mac"', {
- 'sources': [
- 'app/webrtc/objc/RTCNSGLVideoView.m',
- 'app/webrtc/objc/public/RTCNSGLVideoView.h',
- ],
- 'xcode_settings': {
- # Need to build against 10.7 framework for full ARC support
- # on OSX.
- 'MACOSX_DEPLOYMENT_TARGET' : '10.7',
- # RTCVideoTrack.mm uses code with partial availability.
- # https://code.google.com/p/webrtc/issues/detail?id=4695
- 'WARNING_CFLAGS!': ['-Wpartial-availability'],
- },
- 'link_settings': {
- 'xcode_settings': {
- 'OTHER_LDFLAGS': [
- '-framework Cocoa',
- ],
- },
- },
- }],
- ],
- }, # target libjingle_peerconnection_objc
- ],
- }],
- ],
- 'targets': [
- {
- 'target_name': 'libjingle_p2p',
- 'type': 'static_library',
- 'dependencies': [
- '<(webrtc_root)/base/base.gyp:rtc_base',
- '<(webrtc_root)/media/media.gyp:rtc_media',
- ],
- 'conditions': [
- ['build_libsrtp==1', {
- 'dependencies': [
- '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
- ],
- }],
- ],
- 'include_dirs': [
- '<(DEPTH)/testing/gtest/include',
- ],
- 'include_dirs!': [
- '<(DEPTH)/webrtc',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(DEPTH)/testing/gtest/include',
- ],
- 'include_dirs!': [
- '<(DEPTH)/webrtc',
- ],
- },
- 'sources': [
- 'session/media/audiomonitor.cc',
- 'session/media/audiomonitor.h',
- 'session/media/bundlefilter.cc',
- 'session/media/bundlefilter.h',
- 'session/media/channel.cc',
- 'session/media/channel.h',
- 'session/media/channelmanager.cc',
- 'session/media/channelmanager.h',
- 'session/media/currentspeakermonitor.cc',
- 'session/media/currentspeakermonitor.h',
- 'session/media/mediamonitor.cc',
- 'session/media/mediamonitor.h',
- 'session/media/mediasession.cc',
- 'session/media/mediasession.h',
- 'session/media/mediasink.h',
- 'session/media/rtcpmuxfilter.cc',
- 'session/media/rtcpmuxfilter.h',
- 'session/media/srtpfilter.cc',
- 'session/media/srtpfilter.h',
- 'session/media/voicechannel.h',
- ],
- }, # target libjingle_p2p
- ],
-}
« no previous file with comments | « talk/build/merge_ios_libs.gyp ('k') | talk/libjingle_p2p_unittest.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698