From bf0845201a3850a0aad9a11c974162e39ac897bc Mon Sep 17 00:00:00 2001 From: magjed Date: Fri, 13 Jan 2017 07:10:16 -0800 Subject: [PATCH] Remove use of PCH files in webrtc/sdk/objc A decision has been made to not use prefix header files. BUG=None Review-Url: https://codereview.webrtc.org/2590823002 Cr-Commit-Position: refs/heads/master@{#16056} --- webrtc/BUILD.gn | 2 -- .../objc/Framework/Classes/RTCNSGLVideoView.m | 2 ++ webrtc/sdk/objc/Framework/Classes/RTCShader.h | 2 ++ .../Headers/WebRTC/RTCNSGLVideoView.h | 2 ++ webrtc/sdk/objc/WebRTC-Prefix.pch | 36 ------------------- 5 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 webrtc/sdk/objc/WebRTC-Prefix.pch diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index 36d9f9e749..640a6a0aa7 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -221,8 +221,6 @@ config("common_config") { config("common_objc") { libs = [ "Foundation.framework" ] - precompiled_header = "sdk/objc/WebRTC-Prefix.pch" - precompiled_source = "sdk/objc/WebRTC-Prefix.pch" } if (!build_with_chromium) { diff --git a/webrtc/sdk/objc/Framework/Classes/RTCNSGLVideoView.m b/webrtc/sdk/objc/Framework/Classes/RTCNSGLVideoView.m index 415efe8228..18dc4d1315 100644 --- a/webrtc/sdk/objc/Framework/Classes/RTCNSGLVideoView.m +++ b/webrtc/sdk/objc/Framework/Classes/RTCNSGLVideoView.m @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ +#import + #if !TARGET_OS_IPHONE #import "WebRTC/RTCNSGLVideoView.h" diff --git a/webrtc/sdk/objc/Framework/Classes/RTCShader.h b/webrtc/sdk/objc/Framework/Classes/RTCShader.h index ac2d0f6ee0..c35a528b44 100644 --- a/webrtc/sdk/objc/Framework/Classes/RTCShader.h +++ b/webrtc/sdk/objc/Framework/Classes/RTCShader.h @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ +#import + #import "RTCOpenGLDefines.h" @class RTCVideoFrame; diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h index d9ed6fb9f2..34588dbe4c 100644 --- a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h +++ b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ +#import + #if !TARGET_OS_IPHONE #import diff --git a/webrtc/sdk/objc/WebRTC-Prefix.pch b/webrtc/sdk/objc/WebRTC-Prefix.pch deleted file mode 100644 index c56cb48ab8..0000000000 --- a/webrtc/sdk/objc/WebRTC-Prefix.pch +++ /dev/null @@ -1,36 +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. - */ - -#ifdef __OBJC__ - -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - -#if !defined(__has_feature) || !__has_feature(nullability) -#error "This file requires nullability support." -#endif - -#import - -// The following nonnull macros were introduced in OSX SDK 10.10.3. However, -// the bots appear to be running something older. We define them here if they -// aren't already defined in NSObjCRuntime.h, which is included by -// Foundation/Foundation.h. - -#if !defined(NS_ASSUME_NONNULL_BEGIN) -#define NS_ASSUME_NONNULL_BEGIN -#endif - -#if !defined(NS_ASSUME_NONNULL_END) -#define NS_ASSUME_NONNULL_END -#endif - -#endif // __OBJC__