Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit f25590e

Browse files
MirkoBonadeiCommit Bot
authored andcommitted
Revert "Remove placeholder Obj-C headers and use angle-bracketed headers."
This reverts commit 6bfad33. Reason for revert: Breaks downstream project. 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 <[email protected]> > Reviewed-by: Anders Carlsson <[email protected]> > Cr-Commit-Position: refs/heads/master@{#32343} [email protected],[email protected],[email protected],[email protected] Change-Id: I7a6f72ecb8feebf06ad0fe0ecef071da43b98fca No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9627 Bug: webrtc:11984 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/187160 Reviewed-by: Mirko Bonadei <[email protected]> Commit-Queue: Mirko Bonadei <[email protected]> Cr-Commit-Position: refs/heads/master@{#32344}
1 parent 6bfad33 commit f25590e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+833
-135
lines changed

sdk/BUILD.gn

Lines changed: 87 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ if (is_ios || is_mac) {
5757
# without pathname (so it works from within the framework module).
5858
"objc/base",
5959

60-
# Contains framework headers
61-
"$target_gen_dir/WebRTC.framework",
60+
# This is here for backward compatiblity reasons.
61+
"objc/Framework/Headers", # TODO(bugs.webrtc.org/9627): Remove this.
6262
]
6363
cflags = [
6464
"-Wimplicit-retain-self",
@@ -950,6 +950,7 @@ if (is_ios || is_mac) {
950950
":base_objc",
951951
":file_logger_objc",
952952
":helpers_objc",
953+
":legacy_header_paths",
953954
":mediaconstraints_objc",
954955
":mediasource_objc",
955956
":native_api",
@@ -995,6 +996,90 @@ if (is_ios || is_mac) {
995996
}
996997
}
997998

999+
# TODO(bugs.webrtc.org/9627): Remove this target.
1000+
rtc_source_set("legacy_header_paths") {
1001+
sources = [
1002+
"objc/Framework/Classes/Common/NSString+StdString.h",
1003+
"objc/Framework/Classes/Common/scoped_cftyperef.h",
1004+
"objc/Framework/Classes/PeerConnection/RTCConfiguration+Native.h",
1005+
"objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Native.h",
1006+
"objc/Framework/Classes/Video/RTCDefaultShader.h",
1007+
"objc/Framework/Classes/Video/RTCNV12TextureCache.h",
1008+
"objc/Framework/Classes/VideoToolbox/nalu_rewriter.h",
1009+
"objc/Framework/Headers/WebRTC/RTCAudioSession.h",
1010+
"objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h",
1011+
"objc/Framework/Headers/WebRTC/RTCAudioSource.h",
1012+
"objc/Framework/Headers/WebRTC/RTCAudioTrack.h",
1013+
"objc/Framework/Headers/WebRTC/RTCCVPixelBuffer.h",
1014+
"objc/Framework/Headers/WebRTC/RTCCallbackLogger.h",
1015+
"objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h",
1016+
"objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h",
1017+
"objc/Framework/Headers/WebRTC/RTCCertificate.h",
1018+
"objc/Framework/Headers/WebRTC/RTCConfiguration.h",
1019+
"objc/Framework/Headers/WebRTC/RTCDataChannel.h",
1020+
"objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h",
1021+
"objc/Framework/Headers/WebRTC/RTCDefaultVideoDecoderFactory.h",
1022+
"objc/Framework/Headers/WebRTC/RTCDefaultVideoEncoderFactory.h",
1023+
"objc/Framework/Headers/WebRTC/RTCDispatcher.h",
1024+
"objc/Framework/Headers/WebRTC/RTCDtmfSender.h",
1025+
"objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h",
1026+
"objc/Framework/Headers/WebRTC/RTCFieldTrials.h",
1027+
"objc/Framework/Headers/WebRTC/RTCFileLogger.h",
1028+
"objc/Framework/Headers/WebRTC/RTCFileVideoCapturer.h",
1029+
"objc/Framework/Headers/WebRTC/RTCH264ProfileLevelId.h",
1030+
"objc/Framework/Headers/WebRTC/RTCIceCandidate.h",
1031+
"objc/Framework/Headers/WebRTC/RTCIceServer.h",
1032+
"objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h",
1033+
"objc/Framework/Headers/WebRTC/RTCLogging.h",
1034+
"objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h",
1035+
"objc/Framework/Headers/WebRTC/RTCMTLVideoView.h",
1036+
"objc/Framework/Headers/WebRTC/RTCMacros.h",
1037+
"objc/Framework/Headers/WebRTC/RTCMediaConstraints.h",
1038+
"objc/Framework/Headers/WebRTC/RTCMediaSource.h",
1039+
"objc/Framework/Headers/WebRTC/RTCMediaStream.h",
1040+
"objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h",
1041+
"objc/Framework/Headers/WebRTC/RTCMetrics.h",
1042+
"objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h",
1043+
"objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h",
1044+
"objc/Framework/Headers/WebRTC/RTCPeerConnection.h",
1045+
"objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h",
1046+
"objc/Framework/Headers/WebRTC/RTCPeerConnectionFactoryOptions.h",
1047+
"objc/Framework/Headers/WebRTC/RTCRtcpParameters.h",
1048+
"objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h",
1049+
"objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h",
1050+
"objc/Framework/Headers/WebRTC/RTCRtpHeaderExtension.h",
1051+
"objc/Framework/Headers/WebRTC/RTCRtpParameters.h",
1052+
"objc/Framework/Headers/WebRTC/RTCRtpReceiver.h",
1053+
"objc/Framework/Headers/WebRTC/RTCRtpSender.h",
1054+
"objc/Framework/Headers/WebRTC/RTCRtpTransceiver.h",
1055+
"objc/Framework/Headers/WebRTC/RTCSSLAdapter.h",
1056+
"objc/Framework/Headers/WebRTC/RTCSessionDescription.h",
1057+
"objc/Framework/Headers/WebRTC/RTCTracing.h",
1058+
"objc/Framework/Headers/WebRTC/RTCVideoCapturer.h",
1059+
"objc/Framework/Headers/WebRTC/RTCVideoCodec.h",
1060+
"objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h",
1061+
"objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h",
1062+
"objc/Framework/Headers/WebRTC/RTCVideoCodecInfo.h",
1063+
"objc/Framework/Headers/WebRTC/RTCVideoDecoderVP8.h",
1064+
"objc/Framework/Headers/WebRTC/RTCVideoDecoderVP9.h",
1065+
"objc/Framework/Headers/WebRTC/RTCVideoEncoderVP8.h",
1066+
"objc/Framework/Headers/WebRTC/RTCVideoEncoderVP9.h",
1067+
"objc/Framework/Headers/WebRTC/RTCVideoFrame.h",
1068+
"objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h",
1069+
"objc/Framework/Headers/WebRTC/RTCVideoRenderer.h",
1070+
"objc/Framework/Headers/WebRTC/RTCVideoSource.h",
1071+
"objc/Framework/Headers/WebRTC/RTCVideoTrack.h",
1072+
"objc/Framework/Headers/WebRTC/RTCVideoViewShading.h",
1073+
"objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h",
1074+
"objc/Framework/Native/api/audio_device_module.h",
1075+
"objc/Framework/Native/api/video_decoder_factory.h",
1076+
"objc/Framework/Native/api/video_encoder_factory.h",
1077+
"objc/Framework/Native/api/video_frame_buffer.h",
1078+
"objc/Framework/Native/src/objc_video_decoder_factory.h",
1079+
"objc/Framework/Native/src/objc_video_encoder_factory.h",
1080+
]
1081+
}
1082+
9981083
if (rtc_include_tests) {
9991084
if (is_ios) {
10001085
rtc_library("sdk_unittests_sources") {
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
* Copyright 2016 The WebRTC Project Authors. All rights reserved.
3+
*
4+
* Use of this source code is governed by a BSD-style license
5+
* that can be found in the LICENSE file in the root of the source
6+
* tree. An additional intellectual property rights grant can be found
7+
* in the file PATENTS. All contributing project authors may
8+
* be found in the AUTHORS file in the root of the source tree.
9+
*/
10+
11+
#import "components/audio/RTCAudioSession.h"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
* Copyright 2016 The WebRTC Project Authors. All rights reserved.
3+
*
4+
* Use of this source code is governed by a BSD-style license
5+
* that can be found in the LICENSE file in the root of the source
6+
* tree. An additional intellectual property rights grant can be found
7+
* in the file PATENTS. All contributing project authors may
8+
* be found in the AUTHORS file in the root of the source tree.
9+
*/
10+
11+
#import "components/audio/RTCAudioSessionConfiguration.h"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
* Copyright 2016 The WebRTC project authors. All Rights Reserved.
3+
*
4+
* Use of this source code is governed by a BSD-style license
5+
* that can be found in the LICENSE file in the root of the source
6+
* tree. An additional intellectual property rights grant can be found
7+
* in the file PATENTS. All contributing project authors may
8+
* be found in the AUTHORS file in the root of the source tree.
9+
*/
10+
11+
#import "api/peerconnection/RTCAudioSource.h"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
* Copyright 2015 The WebRTC project authors. All Rights Reserved.
3+
*
4+
* Use of this source code is governed by a BSD-style license
5+
* that can be found in the LICENSE file in the root of the source
6+
* tree. An additional intellectual property rights grant can be found
7+
* in the file PATENTS. All contributing project authors may
8+
* be found in the AUTHORS file in the root of the source tree.
9+
*/
10+
11+
#import "api/peerconnection/RTCAudioTrack.h"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
* Copyright 2018 The WebRTC project authors. All Rights Reserved.
3+
*
4+
* Use of this source code is governed by a BSD-style license
5+
* that can be found in the LICENSE file in the root of the source
6+
* tree. An additional intellectual property rights grant can be found
7+
* in the file PATENTS. All contributing project authors may
8+
* be found in the AUTHORS file in the root of the source tree.
9+
*/
10+
11+
#import "components/video_frame_buffer/RTCCVPixelBuffer.h"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
* Copyright 2018 The WebRTC project authors. All Rights Reserved.
3+
*
4+
* Use of this source code is governed by a BSD-style license
5+
* that can be found in the LICENSE file in the root of the source
6+
* tree. An additional intellectual property rights grant can be found
7+
* in the file PATENTS. All contributing project authors may
8+
* be found in the AUTHORS file in the root of the source tree.
9+
*/
10+
11+
#import "api/logging/RTCCallbackLogger.h"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
* Copyright 2015 The WebRTC Project Authors. All rights reserved.
3+
*
4+
* Use of this source code is governed by a BSD-style license
5+
* that can be found in the LICENSE file in the root of the source
6+
* tree. An additional intellectual property rights grant can be found
7+
* in the file PATENTS. All contributing project authors may
8+
* be found in the AUTHORS file in the root of the source tree.
9+
*/
10+
11+
#import "helpers/RTCCameraPreviewView.h"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
* Copyright 2017 The WebRTC project authors. All Rights Reserved.
3+
*
4+
* Use of this source code is governed by a BSD-style license
5+
* that can be found in the LICENSE file in the root of the source
6+
* tree. An additional intellectual property rights grant can be found
7+
* in the file PATENTS. All contributing project authors may
8+
* be found in the AUTHORS file in the root of the source tree.
9+
*/
10+
11+
#import "components/capturer/RTCCameraVideoCapturer.h"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
* Copyright 2018 The WebRTC project authors. All Rights Reserved.
3+
*
4+
* Use of this source code is governed by a BSD-style license
5+
* that can be found in the LICENSE file in the root of the source
6+
* tree. An additional intellectual property rights grant can be found
7+
* in the file PATENTS. All contributing project authors may
8+
* be found in the AUTHORS file in the root of the source tree.
9+
*/
10+
11+
#import "api/peerconnection/RTCCertificate.h"

0 commit comments

Comments
 (0)