From 3360352c2bd7223642b3c1ee757d02e0f8d43cf0 Mon Sep 17 00:00:00 2001
From: phoglund <phoglund@webrtc.org>
Date: Wed, 5 Oct 2016 06:52:22 -0700
Subject: [PATCH] Make sure vp9 actually gets excluded in gn as well.

It was being excluded in this manner in gyp so it should be in gn as
well.

R=charujain@webrtc.org,kjellander@webrtc.org
BUG=webrtc:6412

Review-Url: https://codereview.webrtc.org/2392053003
Cr-Commit-Position: refs/heads/master@{#14525}
---
 webrtc/BUILD.gn                      |  4 ++++
 webrtc/modules/video_coding/BUILD.gn | 24 +++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 1e1ef00096..fe8760fed7 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -130,6 +130,10 @@ config("common_config") {
     defines += [ "EXPAT_RELATIVE_PATH" ]
   }
 
+  if (!rtc_libvpx_build_vp9) {
+    defines += [ "RTC_DISABLE_VP9" ]
+  }
+
   if (build_with_chromium) {
     defines += [
       # NOTICE: Since common_inherited_config is used in public_configs for our
diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn
index 21539a2a8f..45ff5a7004 100644
--- a/webrtc/modules/video_coding/BUILD.gn
+++ b/webrtc/modules/video_coding/BUILD.gn
@@ -279,15 +279,21 @@ rtc_static_library("webrtc_vp8") {
 }
 
 rtc_static_library("webrtc_vp9") {
-  sources = [
-    "codecs/vp9/include/vp9.h",
-    "codecs/vp9/screenshare_layers.cc",
-    "codecs/vp9/screenshare_layers.h",
-    "codecs/vp9/vp9_frame_buffer_pool.cc",
-    "codecs/vp9/vp9_frame_buffer_pool.h",
-    "codecs/vp9/vp9_impl.cc",
-    "codecs/vp9/vp9_impl.h",
-  ]
+  if (rtc_libvpx_build_vp9) {
+    sources = [
+      "codecs/vp9/include/vp9.h",
+      "codecs/vp9/screenshare_layers.cc",
+      "codecs/vp9/screenshare_layers.h",
+      "codecs/vp9/vp9_frame_buffer_pool.cc",
+      "codecs/vp9/vp9_frame_buffer_pool.h",
+      "codecs/vp9/vp9_impl.cc",
+      "codecs/vp9/vp9_impl.h",
+    ]
+  } else {
+    sources = [
+      "codecs/vp9/vp9_noop.cc",
+    ]
+  }
 
   if (is_clang) {
     # Suppress warnings from Chrome's Clang plugins.