commit 84f6a3fc6b7759e98889a38ab74980efbf418ce7
author kwiberg <kwiberg@webrtc.org> Tue Sep 05 08:43:13 2017 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Sep 05 15:43:13 2017 +0000
tree a122fd2e609461b65169b993cb99aa7874a7c4bb
parent ad43d4b29e54a914eeb88e7bc26db2271c5742f5

Move optional.h to webrtc/api/

We use Optional in our public API, so its header should be in
webrtc/api/.

BUG=webrtc:8205

Review-Url: https://codereview.webrtc.org/3011943002
Cr-Commit-Position: refs/heads/master@{#19693}

webrtc/sdk/BUILD.gn

diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn
index ff97082..086ce49 100644
--- a/webrtc/sdk/BUILD.gn
+++ b/webrtc/sdk/BUILD.gn
@@ -183,6 +183,7 @@
         ":common_objc",
         ":videotracksource_objc",
         "../api:libjingle_peerconnection_api",
+        "../api:optional",
         "../common_video",
         "../media:rtc_media_base",
         "../rtc_base:rtc_base",

webrtc/sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm

diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm b/webrtc/sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm
index 900f284..14301ba 100644
--- a/webrtc/sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm
+++ b/webrtc/sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm
@@ -20,7 +20,7 @@
 #import "RTCShader.h"
 #import "WebRTC/RTCLogging.h"
 
-#include "webrtc/rtc_base/optional.h"
+#include "webrtc/api/optional.h"
 
 static const int kYTextureUnit = 0;
 static const int kUTextureUnit = 1;