From 37d41eea047799ccca2f09c941870c26ee3ffc0a Mon Sep 17 00:00:00 2001 From: "Daniel.L (Byoungchan Lee)" Date: Sat, 17 Oct 2020 07:49:28 +0900 Subject: [PATCH] Reland "Remove placeholder Obj-C headers and use angle-bracketed headers." This is a reland of 6bfad33fd866e682c871c2ef2172b70b609593d1 Original change's description: > Remove placeholder Obj-C headers and use angle-bracketed headers. > > sdk/objc/Framework/Headers are just a placeholder headers > for backward compatibility and I don't think it is really need this for now. > Instead, we can generate the framework header in > ios/mac_framework_bundle_with_umbrella_header. > Also clang supports the -Wquoted-include-in-framework-header warning, > and in Xcode 12, it's in Xcode's recommended settings. This warnings > can be avoided by replacing double-quoted includes with angle-bracketed > includes when generate framework headers. > > No-Presubmit: True > Bug: webrtc:9627, webrtc:11984 > Change-Id: I3f6258dfa77a5acee669614005b2747feee35e39 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/185920 > Commit-Queue: Anders Carlsson > Reviewed-by: Anders Carlsson > Cr-Commit-Position: refs/heads/master@{#32343} TBR=tommi@webrtc.org, andersc@webrtc.org No-Presubmit: True Bug: webrtc:9627 Bug: webrtc:11984 Change-Id: I8f44232f1a70b8ff2ce6a4b4792f0a18472fcec3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/187280 Commit-Queue: Mirko Bonadei Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#32429} --- sdk/BUILD.gn | 88 ------------------- .../Headers/WebRTC/RTCAudioSession.h | 11 --- .../WebRTC/RTCAudioSessionConfiguration.h | 11 --- .../Framework/Headers/WebRTC/RTCAudioSource.h | 11 --- .../Framework/Headers/WebRTC/RTCAudioTrack.h | 11 --- .../Headers/WebRTC/RTCCVPixelBuffer.h | 11 --- .../Headers/WebRTC/RTCCallbackLogger.h | 11 --- .../Headers/WebRTC/RTCCameraPreviewView.h | 11 --- .../Headers/WebRTC/RTCCameraVideoCapturer.h | 11 --- .../Framework/Headers/WebRTC/RTCCertificate.h | 11 --- .../Headers/WebRTC/RTCConfiguration.h | 11 --- .../Framework/Headers/WebRTC/RTCDataChannel.h | 11 --- .../WebRTC/RTCDataChannelConfiguration.h | 11 --- .../WebRTC/RTCDefaultVideoDecoderFactory.h | 11 --- .../WebRTC/RTCDefaultVideoEncoderFactory.h | 11 --- .../Framework/Headers/WebRTC/RTCDispatcher.h | 11 --- .../Framework/Headers/WebRTC/RTCDtmfSender.h | 11 --- .../Headers/WebRTC/RTCEAGLVideoView.h | 11 --- .../Framework/Headers/WebRTC/RTCFieldTrials.h | 11 --- .../Framework/Headers/WebRTC/RTCFileLogger.h | 11 --- .../Headers/WebRTC/RTCFileVideoCapturer.h | 11 --- .../Headers/WebRTC/RTCH264ProfileLevelId.h | 11 --- .../Headers/WebRTC/RTCIceCandidate.h | 11 --- .../Framework/Headers/WebRTC/RTCIceServer.h | 11 --- .../Headers/WebRTC/RTCLegacyStatsReport.h | 11 --- .../Framework/Headers/WebRTC/RTCLogging.h | 11 --- .../Headers/WebRTC/RTCMTLNSVideoView.h | 11 --- .../Headers/WebRTC/RTCMTLVideoView.h | 11 --- sdk/objc/Framework/Headers/WebRTC/RTCMacros.h | 11 --- .../Headers/WebRTC/RTCMediaConstraints.h | 11 --- .../Framework/Headers/WebRTC/RTCMediaSource.h | 11 --- .../Framework/Headers/WebRTC/RTCMediaStream.h | 11 --- .../Headers/WebRTC/RTCMediaStreamTrack.h | 11 --- .../Framework/Headers/WebRTC/RTCMetrics.h | 11 --- .../Headers/WebRTC/RTCMetricsSampleInfo.h | 11 --- .../Headers/WebRTC/RTCNSGLVideoView.h | 11 --- .../Headers/WebRTC/RTCPeerConnection.h | 11 --- .../Headers/WebRTC/RTCPeerConnectionFactory.h | 11 --- .../WebRTC/RTCPeerConnectionFactoryOptions.h | 11 --- .../Headers/WebRTC/RTCRtcpParameters.h | 11 --- .../Headers/WebRTC/RTCRtpCodecParameters.h | 11 --- .../Headers/WebRTC/RTCRtpEncodingParameters.h | 11 --- .../Headers/WebRTC/RTCRtpHeaderExtension.h | 11 --- .../Headers/WebRTC/RTCRtpParameters.h | 11 --- .../Framework/Headers/WebRTC/RTCRtpReceiver.h | 11 --- .../Framework/Headers/WebRTC/RTCRtpSender.h | 11 --- .../Headers/WebRTC/RTCRtpTransceiver.h | 11 --- .../Framework/Headers/WebRTC/RTCSSLAdapter.h | 11 --- .../Headers/WebRTC/RTCSessionDescription.h | 11 --- .../Framework/Headers/WebRTC/RTCTracing.h | 11 --- .../Headers/WebRTC/RTCVideoCapturer.h | 11 --- .../Framework/Headers/WebRTC/RTCVideoCodec.h | 20 ----- .../Headers/WebRTC/RTCVideoCodecFactory.h | 14 --- .../Headers/WebRTC/RTCVideoCodecH264.h | 16 ---- .../Headers/WebRTC/RTCVideoCodecInfo.h | 11 --- .../Headers/WebRTC/RTCVideoDecoderVP8.h | 11 --- .../Headers/WebRTC/RTCVideoDecoderVP9.h | 11 --- .../Headers/WebRTC/RTCVideoEncoderVP8.h | 11 --- .../Headers/WebRTC/RTCVideoEncoderVP9.h | 11 --- .../Framework/Headers/WebRTC/RTCVideoFrame.h | 11 --- .../Headers/WebRTC/RTCVideoFrameBuffer.h | 18 ---- .../Headers/WebRTC/RTCVideoRenderer.h | 11 --- .../Framework/Headers/WebRTC/RTCVideoSource.h | 11 --- .../Framework/Headers/WebRTC/RTCVideoTrack.h | 11 --- .../Headers/WebRTC/RTCVideoViewShading.h | 11 --- .../Headers/WebRTC/UIDevice+RTCDevice.h | 11 --- tools_webrtc/apple/copy_framework_header.py | 47 ++++++++++ .../apple/copy_framework_header_test.py | 35 ++++++++ webrtc.gni | 58 ++++++++++-- 69 files changed, 133 insertions(+), 834 deletions(-) delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCAudioSource.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCAudioTrack.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCCVPixelBuffer.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCCallbackLogger.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCCertificate.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCDataChannel.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoDecoderFactory.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoEncoderFactory.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCDispatcher.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCDtmfSender.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCFileLogger.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCFileVideoCapturer.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCH264ProfileLevelId.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCIceCandidate.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCIceServer.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCLogging.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMacros.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMediaConstraints.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMediaSource.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMediaStream.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactoryOptions.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCRtcpParameters.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCRtpHeaderExtension.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCRtpParameters.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCRtpReceiver.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCRtpSender.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCRtpTransceiver.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCSessionDescription.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCTracing.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoCapturer.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecInfo.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP8.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP9.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP8.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP9.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoRenderer.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoSource.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoTrack.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoViewShading.h delete mode 100644 sdk/objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h create mode 100755 tools_webrtc/apple/copy_framework_header.py create mode 100644 tools_webrtc/apple/copy_framework_header_test.py diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index 2a80c65049..f5aafe0aa6 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -56,9 +56,6 @@ if (is_ios || is_mac) { # This is needed so that framework headers can include base headers # without pathname (so it works from within the framework module). "objc/base", - - # This is here for backward compatiblity reasons. - "objc/Framework/Headers", # TODO(bugs.webrtc.org/9627): Remove this. ] cflags = [ "-Wimplicit-retain-self", @@ -948,7 +945,6 @@ if (is_ios || is_mac) { ":base_objc", ":file_logger_objc", ":helpers_objc", - ":legacy_header_paths", ":mediaconstraints_objc", ":mediasource_objc", ":native_api", @@ -994,90 +990,6 @@ if (is_ios || is_mac) { } } - # TODO(bugs.webrtc.org/9627): Remove this target. - rtc_source_set("legacy_header_paths") { - sources = [ - "objc/Framework/Classes/Common/NSString+StdString.h", - "objc/Framework/Classes/Common/scoped_cftyperef.h", - "objc/Framework/Classes/PeerConnection/RTCConfiguration+Native.h", - "objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Native.h", - "objc/Framework/Classes/Video/RTCDefaultShader.h", - "objc/Framework/Classes/Video/RTCNV12TextureCache.h", - "objc/Framework/Classes/VideoToolbox/nalu_rewriter.h", - "objc/Framework/Headers/WebRTC/RTCAudioSession.h", - "objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h", - "objc/Framework/Headers/WebRTC/RTCAudioSource.h", - "objc/Framework/Headers/WebRTC/RTCAudioTrack.h", - "objc/Framework/Headers/WebRTC/RTCCVPixelBuffer.h", - "objc/Framework/Headers/WebRTC/RTCCallbackLogger.h", - "objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h", - "objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h", - "objc/Framework/Headers/WebRTC/RTCCertificate.h", - "objc/Framework/Headers/WebRTC/RTCConfiguration.h", - "objc/Framework/Headers/WebRTC/RTCDataChannel.h", - "objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h", - "objc/Framework/Headers/WebRTC/RTCDefaultVideoDecoderFactory.h", - "objc/Framework/Headers/WebRTC/RTCDefaultVideoEncoderFactory.h", - "objc/Framework/Headers/WebRTC/RTCDispatcher.h", - "objc/Framework/Headers/WebRTC/RTCDtmfSender.h", - "objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h", - "objc/Framework/Headers/WebRTC/RTCFieldTrials.h", - "objc/Framework/Headers/WebRTC/RTCFileLogger.h", - "objc/Framework/Headers/WebRTC/RTCFileVideoCapturer.h", - "objc/Framework/Headers/WebRTC/RTCH264ProfileLevelId.h", - "objc/Framework/Headers/WebRTC/RTCIceCandidate.h", - "objc/Framework/Headers/WebRTC/RTCIceServer.h", - "objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h", - "objc/Framework/Headers/WebRTC/RTCLogging.h", - "objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h", - "objc/Framework/Headers/WebRTC/RTCMTLVideoView.h", - "objc/Framework/Headers/WebRTC/RTCMacros.h", - "objc/Framework/Headers/WebRTC/RTCMediaConstraints.h", - "objc/Framework/Headers/WebRTC/RTCMediaSource.h", - "objc/Framework/Headers/WebRTC/RTCMediaStream.h", - "objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h", - "objc/Framework/Headers/WebRTC/RTCMetrics.h", - "objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h", - "objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h", - "objc/Framework/Headers/WebRTC/RTCPeerConnection.h", - "objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h", - "objc/Framework/Headers/WebRTC/RTCPeerConnectionFactoryOptions.h", - "objc/Framework/Headers/WebRTC/RTCRtcpParameters.h", - "objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h", - "objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h", - "objc/Framework/Headers/WebRTC/RTCRtpHeaderExtension.h", - "objc/Framework/Headers/WebRTC/RTCRtpParameters.h", - "objc/Framework/Headers/WebRTC/RTCRtpReceiver.h", - "objc/Framework/Headers/WebRTC/RTCRtpSender.h", - "objc/Framework/Headers/WebRTC/RTCRtpTransceiver.h", - "objc/Framework/Headers/WebRTC/RTCSSLAdapter.h", - "objc/Framework/Headers/WebRTC/RTCSessionDescription.h", - "objc/Framework/Headers/WebRTC/RTCTracing.h", - "objc/Framework/Headers/WebRTC/RTCVideoCapturer.h", - "objc/Framework/Headers/WebRTC/RTCVideoCodec.h", - "objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h", - "objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h", - "objc/Framework/Headers/WebRTC/RTCVideoCodecInfo.h", - "objc/Framework/Headers/WebRTC/RTCVideoDecoderVP8.h", - "objc/Framework/Headers/WebRTC/RTCVideoDecoderVP9.h", - "objc/Framework/Headers/WebRTC/RTCVideoEncoderVP8.h", - "objc/Framework/Headers/WebRTC/RTCVideoEncoderVP9.h", - "objc/Framework/Headers/WebRTC/RTCVideoFrame.h", - "objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h", - "objc/Framework/Headers/WebRTC/RTCVideoRenderer.h", - "objc/Framework/Headers/WebRTC/RTCVideoSource.h", - "objc/Framework/Headers/WebRTC/RTCVideoTrack.h", - "objc/Framework/Headers/WebRTC/RTCVideoViewShading.h", - "objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h", - "objc/Framework/Native/api/audio_device_module.h", - "objc/Framework/Native/api/video_decoder_factory.h", - "objc/Framework/Native/api/video_encoder_factory.h", - "objc/Framework/Native/api/video_frame_buffer.h", - "objc/Framework/Native/src/objc_video_decoder_factory.h", - "objc/Framework/Native/src/objc_video_encoder_factory.h", - ] - } - if (rtc_include_tests) { if (is_ios) { rtc_library("sdk_unittests_sources") { diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h b/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h deleted file mode 100644 index 64c49977c0..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC Project Authors. All rights reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "components/audio/RTCAudioSession.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h b/sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h deleted file mode 100644 index 6ee1bc5435..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC Project Authors. All rights reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "components/audio/RTCAudioSessionConfiguration.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCAudioSource.h b/sdk/objc/Framework/Headers/WebRTC/RTCAudioSource.h deleted file mode 100644 index a7dc191319..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCAudioSource.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCAudioSource.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCAudioTrack.h b/sdk/objc/Framework/Headers/WebRTC/RTCAudioTrack.h deleted file mode 100644 index 88515bb3fe..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCAudioTrack.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCAudioTrack.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCCVPixelBuffer.h b/sdk/objc/Framework/Headers/WebRTC/RTCCVPixelBuffer.h deleted file mode 100644 index 7a4f847be5..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCCVPixelBuffer.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2018 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "components/video_frame_buffer/RTCCVPixelBuffer.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCCallbackLogger.h b/sdk/objc/Framework/Headers/WebRTC/RTCCallbackLogger.h deleted file mode 100644 index c4585228ed..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCCallbackLogger.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2018 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/logging/RTCCallbackLogger.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h b/sdk/objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h deleted file mode 100644 index 388e72fce0..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC Project Authors. All rights reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "helpers/RTCCameraPreviewView.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h b/sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h deleted file mode 100644 index aac6773b6c..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "components/capturer/RTCCameraVideoCapturer.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCCertificate.h b/sdk/objc/Framework/Headers/WebRTC/RTCCertificate.h deleted file mode 100644 index 9e3b7dcf1a..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCCertificate.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2018 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCCertificate.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h b/sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h deleted file mode 100644 index fe2f0cdfdb..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCConfiguration.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCDataChannel.h b/sdk/objc/Framework/Headers/WebRTC/RTCDataChannel.h deleted file mode 100644 index 4f35079471..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCDataChannel.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCDataChannel.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h b/sdk/objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h deleted file mode 100644 index 20cb4e1c51..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCDataChannelConfiguration.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoDecoderFactory.h b/sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoDecoderFactory.h deleted file mode 100644 index dc46f3f67b..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoDecoderFactory.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "components/video_codec/RTCDefaultVideoDecoderFactory.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoEncoderFactory.h b/sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoEncoderFactory.h deleted file mode 100644 index 7588ffb84a..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoEncoderFactory.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "components/video_codec/RTCDefaultVideoEncoderFactory.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCDispatcher.h b/sdk/objc/Framework/Headers/WebRTC/RTCDispatcher.h deleted file mode 100644 index 2ae9cd89c8..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCDispatcher.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "helpers/RTCDispatcher.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCDtmfSender.h b/sdk/objc/Framework/Headers/WebRTC/RTCDtmfSender.h deleted file mode 100644 index 20407102c6..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCDtmfSender.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCDtmfSender.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h b/sdk/objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h deleted file mode 100644 index ec5b1d7087..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "components/renderer/opengl/RTCEAGLVideoView.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h b/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h deleted file mode 100644 index 386989abf0..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC Project Authors. All rights reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCFieldTrials.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCFileLogger.h b/sdk/objc/Framework/Headers/WebRTC/RTCFileLogger.h deleted file mode 100644 index ae7d9ef95f..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCFileLogger.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCFileLogger.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCFileVideoCapturer.h b/sdk/objc/Framework/Headers/WebRTC/RTCFileVideoCapturer.h deleted file mode 100644 index 344eca9b00..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCFileVideoCapturer.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2017 The WebRTC Project Authors. All rights reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "components/capturer/RTCFileVideoCapturer.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCH264ProfileLevelId.h b/sdk/objc/Framework/Headers/WebRTC/RTCH264ProfileLevelId.h deleted file mode 100644 index 57798148a0..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCH264ProfileLevelId.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "components/video_codec/RTCH264ProfileLevelId.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCIceCandidate.h b/sdk/objc/Framework/Headers/WebRTC/RTCIceCandidate.h deleted file mode 100644 index dbeea22000..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCIceCandidate.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCIceCandidate.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCIceServer.h b/sdk/objc/Framework/Headers/WebRTC/RTCIceServer.h deleted file mode 100644 index 967b19c066..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCIceServer.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCIceServer.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h b/sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h deleted file mode 100644 index a727a495fc..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCLegacyStatsReport.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCLogging.h b/sdk/objc/Framework/Headers/WebRTC/RTCLogging.h deleted file mode 100644 index bb5e25dbde..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCLogging.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "base/RTCLogging.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h b/sdk/objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h deleted file mode 100644 index 4368a8a95b..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "components/renderer/metal/RTCMTLNSVideoView.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h b/sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h deleted file mode 100644 index 9f43dc5613..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "components/renderer/metal/RTCMTLVideoView.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h b/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h deleted file mode 100644 index 8582a33600..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC Project Authors. All rights reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "base/RTCMacros.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMediaConstraints.h b/sdk/objc/Framework/Headers/WebRTC/RTCMediaConstraints.h deleted file mode 100644 index 1059725c05..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCMediaConstraints.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCMediaConstraints.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMediaSource.h b/sdk/objc/Framework/Headers/WebRTC/RTCMediaSource.h deleted file mode 100644 index f642524d2a..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCMediaSource.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCMediaSource.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMediaStream.h b/sdk/objc/Framework/Headers/WebRTC/RTCMediaStream.h deleted file mode 100644 index 9b4d03213c..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCMediaStream.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCMediaStream.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h b/sdk/objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h deleted file mode 100644 index 9de0edbfbd..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCMediaStreamTrack.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h b/sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h deleted file mode 100644 index b44289ea34..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCMetrics.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h b/sdk/objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h deleted file mode 100644 index 5ee84c1457..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCMetricsSampleInfo.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h b/sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h deleted file mode 100644 index 3fa89aa30e..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "components/renderer/opengl/RTCNSGLVideoView.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h b/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h deleted file mode 100644 index df9bc85cdd..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCPeerConnection.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h b/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h deleted file mode 100644 index ff544a00c8..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCPeerConnectionFactory.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactoryOptions.h b/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactoryOptions.h deleted file mode 100644 index c4699c963e..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactoryOptions.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCPeerConnectionFactoryOptions.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCRtcpParameters.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtcpParameters.h deleted file mode 100644 index 28f4f5fcfc..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCRtcpParameters.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2018 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCRtcpParameters.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h deleted file mode 100644 index d4b76012f9..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCRtpCodecParameters.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h deleted file mode 100644 index a1510ba98f..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCRtpEncodingParameters.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCRtpHeaderExtension.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpHeaderExtension.h deleted file mode 100644 index 3bc6b2ba54..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCRtpHeaderExtension.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2018 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCRtpHeaderExtension.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCRtpParameters.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpParameters.h deleted file mode 100644 index 0e5b7e2178..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCRtpParameters.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCRtpParameters.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCRtpReceiver.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpReceiver.h deleted file mode 100644 index ff61f824a0..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCRtpReceiver.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCRtpReceiver.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCRtpSender.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpSender.h deleted file mode 100644 index d5a4e65d09..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCRtpSender.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCRtpSender.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCRtpTransceiver.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpTransceiver.h deleted file mode 100644 index ff07e29fb7..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCRtpTransceiver.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2018 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCRtpTransceiver.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h b/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h deleted file mode 100644 index c721875e70..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCSSLAdapter.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCSessionDescription.h b/sdk/objc/Framework/Headers/WebRTC/RTCSessionDescription.h deleted file mode 100644 index b5d55f7729..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCSessionDescription.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCSessionDescription.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCTracing.h b/sdk/objc/Framework/Headers/WebRTC/RTCTracing.h deleted file mode 100644 index fd4a6ffecb..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCTracing.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC Project Authors. All rights reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCTracing.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCapturer.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCapturer.h deleted file mode 100644 index 93586fc0d5..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCapturer.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "base/RTCVideoCapturer.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h deleted file mode 100644 index b4511a9985..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/video_codec/RTCVideoCodecConstants.h" -#import "base/RTCCodecSpecificInfo.h" -#import "base/RTCEncodedImage.h" -#import "base/RTCRtpFragmentationHeader.h" -#import "base/RTCVideoCodecInfo.h" -#import "base/RTCVideoDecoder.h" -#import "base/RTCVideoEncoder.h" -#import "base/RTCVideoEncoderQpThresholds.h" -#import "base/RTCVideoEncoderSettings.h" -#import "components/video_codec/RTCH264ProfileLevelId.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h deleted file mode 100644 index 5e8d353aa1..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "base/RTCVideoDecoderFactory.h" -#import "base/RTCVideoEncoderFactory.h" -#import "components/video_codec/RTCDefaultVideoDecoderFactory.h" -#import "components/video_codec/RTCDefaultVideoEncoderFactory.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h deleted file mode 100644 index d1ff92e27a..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "components/video_codec/RTCCodecSpecificInfoH264.h" -#import "components/video_codec/RTCH264ProfileLevelId.h" -#import "components/video_codec/RTCVideoDecoderFactoryH264.h" -#import "components/video_codec/RTCVideoDecoderH264.h" -#import "components/video_codec/RTCVideoEncoderFactoryH264.h" -#import "components/video_codec/RTCVideoEncoderH264.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecInfo.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecInfo.h deleted file mode 100644 index 10c5fea465..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecInfo.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "base/RTCVideoCodecInfo.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP8.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP8.h deleted file mode 100644 index 9c9e840e6d..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP8.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/video_codec/RTCVideoDecoderVP8.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP9.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP9.h deleted file mode 100644 index 1a7c38267b..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP9.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/video_codec/RTCVideoDecoderVP9.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP8.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP8.h deleted file mode 100644 index 65a7850884..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP8.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/video_codec/RTCVideoEncoderVP8.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP9.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP9.h deleted file mode 100644 index 5d01835805..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP9.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/video_codec/RTCVideoEncoderVP9.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h deleted file mode 100644 index ec1543d8e3..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "base/RTCVideoFrame.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h deleted file mode 100644 index 8d4be50868..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/video_frame_buffer/RTCNativeI420Buffer.h" -#import "api/video_frame_buffer/RTCNativeMutableI420Buffer.h" -#import "base/RTCI420Buffer.h" -#import "base/RTCMutableI420Buffer.h" -#import "base/RTCMutableYUVPlanarBuffer.h" -#import "base/RTCVideoFrameBuffer.h" -#import "base/RTCYUVPlanarBuffer.h" -#import "components/video_frame_buffer/RTCCVPixelBuffer.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoRenderer.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoRenderer.h deleted file mode 100644 index 0e32c02c9a..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCVideoRenderer.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "base/RTCVideoRenderer.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoSource.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoSource.h deleted file mode 100644 index 91e635de6c..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCVideoSource.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCVideoSource.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoTrack.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoTrack.h deleted file mode 100644 index b5dd1ddf59..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCVideoTrack.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "api/peerconnection/RTCVideoTrack.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoViewShading.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoViewShading.h deleted file mode 100644 index 7c6cd7a2e5..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/RTCVideoViewShading.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "components/renderer/opengl/RTCVideoViewShading.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h b/sdk/objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h deleted file mode 100644 index 724dc8dca4..0000000000 --- a/sdk/objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#import "helpers/UIDevice+RTCDevice.h" diff --git a/tools_webrtc/apple/copy_framework_header.py b/tools_webrtc/apple/copy_framework_header.py new file mode 100755 index 0000000000..d194650934 --- /dev/null +++ b/tools_webrtc/apple/copy_framework_header.py @@ -0,0 +1,47 @@ +#!/usr/bin/env python +# Copyright (c) 2020 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +import argparse +import re +import sys + + +def replace_double_quote(line): + re_rtc_import = re.compile( + r'(\s*)#import\s+"(\S+/|)(\w+\+|)RTC(\w+)\.h"(.*)', re.DOTALL) + match = re_rtc_import.match(line) + if not match: + return line + + return '%s#import %s' % (match.group(1), match.group(3), + match.group(4), match.group(5)) + + +def process(input_file, output_file): + with open(input_file, 'rb') as fb, open(output_file, 'wb') as fw: + for line in fb.read().decode('UTF-8').splitlines(): + fw.write(replace_double_quote(line).encode('UTF-8')) + fw.write(b"\n") + + +def main(): + parser = argparse.ArgumentParser( + description= + "Copy headers of framework and replace double-quoted includes to" + + " angle-bracketed respectively.") + parser.add_argument('--input', + help='Input header files to copy.', + type=str) + parser.add_argument('--output', help='Output file.', type=str) + parsed_args = parser.parse_args() + return process(parsed_args.input, parsed_args.output) + + +if __name__ == '__main__': + sys.exit(main()) diff --git a/tools_webrtc/apple/copy_framework_header_test.py b/tools_webrtc/apple/copy_framework_header_test.py new file mode 100644 index 0000000000..24bab3eb0b --- /dev/null +++ b/tools_webrtc/apple/copy_framework_header_test.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python +# Copyright (c) 2020 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +import unittest +from copy_framework_header import replace_double_quote + + +class TestCopyFramework(unittest.TestCase): + def testReplaceDoubleQuote(self): + self.assertEqual(replace_double_quote("""#import "RTCMacros.h\""""), + """#import """) + self.assertEqual(replace_double_quote("""#import "RTCMacros.h\"\n"""), + """#import \n""") + self.assertEqual( + replace_double_quote("""#import "UIDevice+RTCDevice.h\"\n"""), + """#import \n""") + self.assertEqual( + replace_double_quote("#import \"components/video_codec/" + + "RTCVideoDecoderFactoryH264.h\"\n"), + """#import \n""") + self.assertEqual( + replace_double_quote( + """@property(atomic, strong) RTC_OBJC_TYPE(RTCVideoFrame) *\n""" + ), + """@property(atomic, strong) RTC_OBJC_TYPE(RTCVideoFrame) *\n""") + + +if __name__ == '__main__': + unittest.main() diff --git a/webrtc.gni b/webrtc.gni index fa3765aa7e..4272e441f0 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -891,17 +891,39 @@ if (is_ios) { # projects. See "mac_framework_bundle_with_umbrella_header". template("ios_framework_bundle_with_umbrella_header") { forward_variables_from(invoker, [ "output_name" ]) + this_target_name = target_name umbrella_header_path = - "$target_gen_dir/$output_name.framework/Headers/$output_name.h" + "$target_gen_dir/$output_name.framework/WebRTC/$output_name.h" + + action_foreach("create_bracket_include_headers_$target_name") { + script = "//tools_webrtc/apple/copy_framework_header.py" + sources = invoker.sources + output_name = invoker.output_name + outputs = [ + "$target_gen_dir/$output_name.framework/WebRTC/{{source_file_part}}", + ] + args = [ + "--input", + "{{source}}", + "--output", + rebase_path(target_gen_dir, root_build_dir) + + "/$output_name.framework/WebRTC/{{source_file_part}}", + ] + } ios_framework_bundle(target_name) { - forward_variables_from(invoker, "*", []) - - deps += [ ":copy_umbrella_header_$target_name" ] + forward_variables_from(invoker, "*", [ "public_headers" ]) + public_headers = get_target_outputs( + ":create_bracket_include_headers_$this_target_name") + deps += [ + ":copy_umbrella_header_$target_name", + ":create_bracket_include_headers_$target_name", + ] } action("umbrella_header_$target_name") { - forward_variables_from(invoker, [ "public_headers" ]) + public_headers = get_target_outputs( + ":create_bracket_include_headers_$this_target_name") script = "//tools_webrtc/ios/generate_umbrella_header.py" @@ -911,6 +933,7 @@ if (is_ios) { rebase_path(umbrella_header_path, root_build_dir), "--sources", ] + public_headers + deps = [ ":create_bracket_include_headers_$this_target_name" ] } copy("copy_umbrella_header_$target_name") { @@ -957,15 +980,34 @@ if (is_mac) { ":copy_framework_headers_$this_target_name", ":copy_modulemap_$this_target_name", ":copy_umbrella_header_$this_target_name", + ":create_bracket_include_headers_$this_target_name", ":modulemap_$this_target_name", ":umbrella_header_$this_target_name", ] } + action_foreach("create_bracket_include_headers_$this_target_name") { + script = "//tools_webrtc/apple/copy_framework_header.py" + sources = invoker.sources + output_name = invoker.output_name + outputs = [ + "$target_gen_dir/$output_name.framework/WebRTC/{{source_file_part}}", + ] + args = [ + "--input", + "{{source}}", + "--output", + rebase_path(target_gen_dir, root_build_dir) + + "/$output_name.framework/WebRTC/{{source_file_part}}", + ] + } + bundle_data("copy_framework_headers_$this_target_name") { - forward_variables_from(invoker, [ "sources" ]) + sources = get_target_outputs( + ":create_bracket_include_headers_$this_target_name") outputs = [ "{{bundle_contents_dir}}/Headers/{{source_file_part}}" ] + deps = [ ":create_bracket_include_headers_$this_target_name" ] } action("modulemap_$this_target_name") { @@ -986,7 +1028,8 @@ if (is_mac) { } action("umbrella_header_$this_target_name") { - forward_variables_from(invoker, [ "sources" ]) + sources = get_target_outputs( + ":create_bracket_include_headers_$this_target_name") script = "//tools_webrtc/ios/generate_umbrella_header.py" @@ -996,6 +1039,7 @@ if (is_mac) { rebase_path(umbrella_header_path, root_build_dir), "--sources", ] + sources + deps = [ ":create_bracket_include_headers_$this_target_name" ] } bundle_data("copy_umbrella_header_$this_target_name") {