Skip to content

Commit

Permalink
Reland "Remove placeholder Obj-C headers and use angle-bracketed head…
Browse files Browse the repository at this point in the history
…ers."

This is a reland of 37d41ee

Original change's description:
> Reland "Remove placeholder Obj-C headers and use angle-bracketed headers."
>
> This is a reland of 6bfad33
>
> 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]
>
> 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 <[email protected]>
> Reviewed-by: Mirko Bonadei <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#32429}

[email protected], [email protected]

No-Presubmit: True
Bug: webrtc:9627
Bug: webrtc:11984
Change-Id: Ida92b8864dffaea37d3053d3c00381644988b54e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/189781
Commit-Queue: Mirko Bonadei <[email protected]>
Reviewed-by: Mirko Bonadei <[email protected]>
Cr-Commit-Position: refs/heads/master@{#32470}
  • Loading branch information
bc-lee authored and Commit Bot committed Oct 22, 2020
1 parent f6d7439 commit 32026ed
Show file tree
Hide file tree
Showing 69 changed files with 133 additions and 834 deletions.
88 changes: 0 additions & 88 deletions sdk/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ if (is_ios || is_mac) {
# This is needed so that framework headers can include base headers
# without pathname (so it works from within the framework module).
"objc/base",

# This is here for backward compatiblity reasons.
"objc/Framework/Headers", # TODO(bugs.webrtc.org/9627): Remove this.
]
cflags = [
"-Wimplicit-retain-self",
Expand Down Expand Up @@ -945,7 +942,6 @@ if (is_ios || is_mac) {
":base_objc",
":file_logger_objc",
":helpers_objc",
":legacy_header_paths",
":mediaconstraints_objc",
":mediasource_objc",
":native_api",
Expand Down Expand Up @@ -991,90 +987,6 @@ if (is_ios || is_mac) {
}
}

# TODO(bugs.webrtc.org/9627): Remove this target.
rtc_source_set("legacy_header_paths") {
sources = [
"objc/Framework/Classes/Common/NSString+StdString.h",
"objc/Framework/Classes/Common/scoped_cftyperef.h",
"objc/Framework/Classes/PeerConnection/RTCConfiguration+Native.h",
"objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Native.h",
"objc/Framework/Classes/Video/RTCDefaultShader.h",
"objc/Framework/Classes/Video/RTCNV12TextureCache.h",
"objc/Framework/Classes/VideoToolbox/nalu_rewriter.h",
"objc/Framework/Headers/WebRTC/RTCAudioSession.h",
"objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h",
"objc/Framework/Headers/WebRTC/RTCAudioSource.h",
"objc/Framework/Headers/WebRTC/RTCAudioTrack.h",
"objc/Framework/Headers/WebRTC/RTCCVPixelBuffer.h",
"objc/Framework/Headers/WebRTC/RTCCallbackLogger.h",
"objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h",
"objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h",
"objc/Framework/Headers/WebRTC/RTCCertificate.h",
"objc/Framework/Headers/WebRTC/RTCConfiguration.h",
"objc/Framework/Headers/WebRTC/RTCDataChannel.h",
"objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h",
"objc/Framework/Headers/WebRTC/RTCDefaultVideoDecoderFactory.h",
"objc/Framework/Headers/WebRTC/RTCDefaultVideoEncoderFactory.h",
"objc/Framework/Headers/WebRTC/RTCDispatcher.h",
"objc/Framework/Headers/WebRTC/RTCDtmfSender.h",
"objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h",
"objc/Framework/Headers/WebRTC/RTCFieldTrials.h",
"objc/Framework/Headers/WebRTC/RTCFileLogger.h",
"objc/Framework/Headers/WebRTC/RTCFileVideoCapturer.h",
"objc/Framework/Headers/WebRTC/RTCH264ProfileLevelId.h",
"objc/Framework/Headers/WebRTC/RTCIceCandidate.h",
"objc/Framework/Headers/WebRTC/RTCIceServer.h",
"objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h",
"objc/Framework/Headers/WebRTC/RTCLogging.h",
"objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h",
"objc/Framework/Headers/WebRTC/RTCMTLVideoView.h",
"objc/Framework/Headers/WebRTC/RTCMacros.h",
"objc/Framework/Headers/WebRTC/RTCMediaConstraints.h",
"objc/Framework/Headers/WebRTC/RTCMediaSource.h",
"objc/Framework/Headers/WebRTC/RTCMediaStream.h",
"objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h",
"objc/Framework/Headers/WebRTC/RTCMetrics.h",
"objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h",
"objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h",
"objc/Framework/Headers/WebRTC/RTCPeerConnection.h",
"objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h",
"objc/Framework/Headers/WebRTC/RTCPeerConnectionFactoryOptions.h",
"objc/Framework/Headers/WebRTC/RTCRtcpParameters.h",
"objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h",
"objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h",
"objc/Framework/Headers/WebRTC/RTCRtpHeaderExtension.h",
"objc/Framework/Headers/WebRTC/RTCRtpParameters.h",
"objc/Framework/Headers/WebRTC/RTCRtpReceiver.h",
"objc/Framework/Headers/WebRTC/RTCRtpSender.h",
"objc/Framework/Headers/WebRTC/RTCRtpTransceiver.h",
"objc/Framework/Headers/WebRTC/RTCSSLAdapter.h",
"objc/Framework/Headers/WebRTC/RTCSessionDescription.h",
"objc/Framework/Headers/WebRTC/RTCTracing.h",
"objc/Framework/Headers/WebRTC/RTCVideoCapturer.h",
"objc/Framework/Headers/WebRTC/RTCVideoCodec.h",
"objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h",
"objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h",
"objc/Framework/Headers/WebRTC/RTCVideoCodecInfo.h",
"objc/Framework/Headers/WebRTC/RTCVideoDecoderVP8.h",
"objc/Framework/Headers/WebRTC/RTCVideoDecoderVP9.h",
"objc/Framework/Headers/WebRTC/RTCVideoEncoderVP8.h",
"objc/Framework/Headers/WebRTC/RTCVideoEncoderVP9.h",
"objc/Framework/Headers/WebRTC/RTCVideoFrame.h",
"objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h",
"objc/Framework/Headers/WebRTC/RTCVideoRenderer.h",
"objc/Framework/Headers/WebRTC/RTCVideoSource.h",
"objc/Framework/Headers/WebRTC/RTCVideoTrack.h",
"objc/Framework/Headers/WebRTC/RTCVideoViewShading.h",
"objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h",
"objc/Framework/Native/api/audio_device_module.h",
"objc/Framework/Native/api/video_decoder_factory.h",
"objc/Framework/Native/api/video_encoder_factory.h",
"objc/Framework/Native/api/video_frame_buffer.h",
"objc/Framework/Native/src/objc_video_decoder_factory.h",
"objc/Framework/Native/src/objc_video_encoder_factory.h",
]
}

if (rtc_include_tests) {
if (is_ios) {
rtc_library("sdk_unittests_sources") {
Expand Down
11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCAudioSource.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCAudioTrack.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCCVPixelBuffer.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCCallbackLogger.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCCertificate.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCDataChannel.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoDecoderFactory.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoEncoderFactory.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCDispatcher.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCDtmfSender.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCFileLogger.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCFileVideoCapturer.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCH264ProfileLevelId.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCIceCandidate.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCIceServer.h

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h

This file was deleted.

Loading

0 comments on commit 32026ed

Please sign in to comment.