From 0bc9c7d58a4e27c3dc87fe99debbf2af291a2f93 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Mon, 19 Feb 2018 11:46:21 +0100 Subject: [PATCH] Fixes for building without SW codecs after GN changes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After https://webrtc-review.googlesource.com/c/src/+/49060 changed the gn check config for sdk/. Add nogncheck for some conditionally imported headers. Bug: webrtc:7925 Change-Id: I57499e990332636991563c6f550a7c9154e7c2ee Reviewed-on: https://webrtc-review.googlesource.com/54820 Reviewed-by: Kári Helgason Commit-Queue: Anders Carlsson Cr-Commit-Position: refs/heads/master@{#22083} --- .../Classes/PeerConnection/RTCDefaultVideoDecoderFactory.m | 4 ++-- .../Classes/PeerConnection/RTCDefaultVideoEncoderFactory.m | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCDefaultVideoDecoderFactory.m b/sdk/objc/Framework/Classes/PeerConnection/RTCDefaultVideoDecoderFactory.m index c412056a4c..405e8c8408 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCDefaultVideoDecoderFactory.m +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCDefaultVideoDecoderFactory.m @@ -12,9 +12,9 @@ #import "WebRTC/RTCVideoCodecH264.h" #if defined(USE_BUILTIN_SW_CODECS) -#import "WebRTC/RTCVideoDecoderVP8.h" +#import "WebRTC/RTCVideoDecoderVP8.h" // nogncheck #if !defined(RTC_DISABLE_VP9) -#import "WebRTC/RTCVideoDecoderVP9.h" +#import "WebRTC/RTCVideoDecoderVP9.h" // nogncheck #endif #endif diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCDefaultVideoEncoderFactory.m b/sdk/objc/Framework/Classes/PeerConnection/RTCDefaultVideoEncoderFactory.m index 8148fc75c9..8de3071b1e 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCDefaultVideoEncoderFactory.m +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCDefaultVideoEncoderFactory.m @@ -13,9 +13,9 @@ #import "WebRTC/RTCVideoCodec.h" #import "WebRTC/RTCVideoCodecH264.h" #if defined(USE_BUILTIN_SW_CODECS) -#import "WebRTC/RTCVideoEncoderVP8.h" +#import "WebRTC/RTCVideoEncoderVP8.h" // nogncheck #if !defined(RTC_DISABLE_VP9) -#import "WebRTC/RTCVideoEncoderVP9.h" +#import "WebRTC/RTCVideoEncoderVP9.h" // nogncheck #endif #endif