Revert "Reland "Remove placeholder Obj-C headers and use angle-bracketed headers.""

This reverts commit 37d41eea047799ccca2f09c941870c26ee3ffc0a.

Reason for revert: Sorry for the back and forth here. I need to revert again because I need to fix a downstream project. The re-landing should
be without changes.

Original change's description:
> 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 <andersc@webrtc.org>
> > Reviewed-by: Anders Carlsson <andersc@webrtc.org>
> > 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 <mbonadei@webrtc.org>
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#32429}

TBR=mbonadei@webrtc.org,andersc@webrtc.org,tommi@webrtc.org,daniel.l@hpcnt.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: webrtc:9627
Bug: webrtc:11984
Change-Id: I006d50c94ad2e336c8a56d49d5ce1c768685f696
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/189542
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32432}

sdk/BUILD.gn

@@ -56,6 +56,9 @@ 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",
@@ -945,6 +948,7 @@ if (is_ios || is_mac) {
         ":base_objc",
         ":file_logger_objc",
         ":helpers_objc",
+        ":legacy_header_paths",
         ":mediaconstraints_objc",
         ":mediasource_objc",
         ":native_api",
@@ -990,6 +994,90 @@ 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") {

sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCAudioSource.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCAudioTrack.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCCVPixelBuffer.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCCallbackLogger.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCCertificate.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCDataChannel.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoDecoderFactory.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoEncoderFactory.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCDispatcher.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCDtmfSender.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCFileLogger.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCFileVideoCapturer.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCH264ProfileLevelId.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCIceCandidate.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCIceServer.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCLogging.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCMacros.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCMediaConstraints.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCMediaSource.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCMediaStream.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactoryOptions.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCRtcpParameters.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCRtpHeaderExtension.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCRtpParameters.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCRtpReceiver.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCRtpSender.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCRtpTransceiver.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCSessionDescription.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCTracing.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCVideoCapturer.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h

@@ -0,0 +1,20 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h

@@ -0,0 +1,14 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h

@@ -0,0 +1,16 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecInfo.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP8.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP9.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP8.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP9.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h

@@ -0,0 +1,18 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCVideoRenderer.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCVideoSource.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCVideoTrack.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/RTCVideoViewShading.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

sdk/objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h

@@ -0,0 +1,11 @@
+/*
+ *  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"

tools_webrtc/apple/copy_framework_header.py

@@ -1,47 +0,0 @@
-#!/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())

tools_webrtc/apple/copy_framework_header_test.py

@@ -1,35 +0,0 @@
-#!/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()

webrtc.gni

@@ -891,39 +891,17 @@ 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/WebRTC/$output_name.h"
+        "$target_gen_dir/$output_name.framework/Headers/$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, "*", [ "public_headers" ])
+      forward_variables_from(invoker, "*", [])
-      public_headers = get_target_outputs(
+
-              ":create_bracket_include_headers_$this_target_name")
+      deps += [ ":copy_umbrella_header_$target_name" ]
-      deps += [
-        ":copy_umbrella_header_$target_name",
-        ":create_bracket_include_headers_$target_name",
-      ]
     }
 
     action("umbrella_header_$target_name") {
-      public_headers = get_target_outputs(
+      forward_variables_from(invoker, [ "public_headers" ])
-              ":create_bracket_include_headers_$this_target_name")
 
       script = "//tools_webrtc/ios/generate_umbrella_header.py"
 
@@ -933,7 +911,6 @@ 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") {
@@ -980,34 +957,15 @@ 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") {
-      sources = get_target_outputs(
+      forward_variables_from(invoker, [ "sources" ])
-              ":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") {
@@ -1028,8 +986,7 @@ if (is_mac) {
     }
 
     action("umbrella_header_$this_target_name") {
-      sources = get_target_outputs(
+      forward_variables_from(invoker, [ "sources" ])
-              ":create_bracket_include_headers_$this_target_name")
 
       script = "//tools_webrtc/ios/generate_umbrella_header.py"
 
@@ -1039,7 +996,6 @@ 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") {