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 <andersc@webrtc.org>
Reviewed-by: Anders Carlsson <andersc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32343}
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 14b2bca..9994e40 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -57,8 +57,8 @@
# 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.
+ # Contains framework headers
+ "$target_gen_dir/WebRTC.framework",
]
cflags = [
"-Wimplicit-retain-self",
@@ -950,7 +950,6 @@
":base_objc",
":file_logger_objc",
":helpers_objc",
- ":legacy_header_paths",
":mediaconstraints_objc",
":mediasource_objc",
":native_api",
@@ -996,90 +995,6 @@
}
}
- # 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 64c4997..0000000
--- 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 6ee1bc5..0000000
--- 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 a7dc191..0000000
--- 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 88515bb..0000000
--- 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 7a4f847..0000000
--- 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 c458522..0000000
--- 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 388e72f..0000000
--- 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 aac6773..0000000
--- 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 9e3b7dc..0000000
--- 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 fe2f0cd..0000000
--- 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 4f35079..0000000
--- 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 20cb4e1..0000000
--- 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 dc46f3f..0000000
--- 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 7588ffb..0000000
--- 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 2ae9cd8..0000000
--- 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 2040710..0000000
--- 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 ec5b1d7..0000000
--- 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 386989a..0000000
--- 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 ae7d9ef..0000000
--- 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 344eca9..0000000
--- 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 5779814..0000000
--- 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 dbeea22..0000000
--- 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 967b19c..0000000
--- 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 a727a49..0000000
--- 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 bb5e25d..0000000
--- 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 4368a8a..0000000
--- 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 9f43dc5..0000000
--- 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 8582a33..0000000
--- 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 1059725..0000000
--- 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 f642524..0000000
--- 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 9b4d032..0000000
--- 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 9de0edb..0000000
--- 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 b44289e..0000000
--- 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 5ee84c1..0000000
--- 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 3fa89aa..0000000
--- 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 df9bc85..0000000
--- 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 ff544a0..0000000
--- 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 c4699c9..0000000
--- 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 28f4f5f..0000000
--- 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 d4b7601..0000000
--- 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 a1510ba..0000000
--- 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 3bc6b2b..0000000
--- 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 0e5b7e2..0000000
--- 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 ff61f82..0000000
--- 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 d5a4e65..0000000
--- 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 ff07e29..0000000
--- 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 c721875..0000000
--- 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 b5d55f77..0000000
--- 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 fd4a6ff..0000000
--- 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 93586fc..0000000
--- 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 b4511a9..0000000
--- 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 5e8d353..0000000
--- 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 d1ff92e..0000000
--- 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 10c5fea..0000000
--- 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 9c9e840..0000000
--- 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 1a7c382..0000000
--- 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 65a7850..0000000
--- 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 5d01835..0000000
--- 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 ec1543d..0000000
--- 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 8d4be508..0000000
--- 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 0e32c02..0000000
--- 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 91e635d..0000000
--- 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 b5dd1dd..0000000
--- 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 7c6cd7a..0000000
--- 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 724dc8d..0000000
--- 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 0000000..d194650
--- /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 <WebRTC/%sRTC%s.h>%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 0000000..24bab3e
--- /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 <WebRTC/RTCMacros.h>""")
+ self.assertEqual(replace_double_quote("""#import "RTCMacros.h\"\n"""),
+ """#import <WebRTC/RTCMacros.h>\n""")
+ self.assertEqual(
+ replace_double_quote("""#import "UIDevice+RTCDevice.h\"\n"""),
+ """#import <WebRTC/UIDevice+RTCDevice.h>\n""")
+ self.assertEqual(
+ replace_double_quote("#import \"components/video_codec/" +
+ "RTCVideoDecoderFactoryH264.h\"\n"),
+ """#import <WebRTC/RTCVideoDecoderFactoryH264.h>\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 fa3765a..4272e44 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -891,17 +891,39 @@
# 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 @@
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 @@
":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 @@
}
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 @@
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") {
