From 610ebd33c27ee85b52ac7271d923fa0206c73530 Mon Sep 17 00:00:00 2001
From: mukai <mukai@chromium.org>
Date: Tue, 7 Oct 2014 12:22:03 -0700
Subject: [PATCH] Fix file list of content GN files for ChromeOS

BUG=None
R=cmasone@chromium.org
TBR=jam@chromium.org
TEST=manually

Review URL: https://codereview.chromium.org/629653002

Cr-Commit-Position: refs/heads/master@{#298540}
---
 content/browser/BUILD.gn | 10 +++++-----
 content/common/BUILD.gn  |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index c6c615b932f9..e7029ffee3a3 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -273,17 +273,17 @@ source_set("browser") {
   if (is_android || is_chromeos || (is_linux && use_dbus)) {
     sources -= [ "battery_status/battery_status_manager_default.cc" ]
   }
-  if (is_linux && !use_dbus) {
+  if (is_chromeos || (is_linux && !use_dbus)) {
     # This will already have gotten removed for all non-Linux cases.
-    sources -= [ "battery_status/battery_status_manager_linux.cc" ]
+    sources -= [
+      "battery_status/battery_status_manager_linux.cc",
+      "geolocation/wifi_data_provider_linux.cc"
+    ]
   }
 
   if (is_android) {
     sources -= [ "geolocation/wifi_data_provider_common.cc" ]
   }
-  if (is_chromeos || (is_linux && !use_dbus)) {
-    sources -= [ "geolocation/wifi_data_provider_linux.cc" ]
-  }
   if (is_linux && use_dbus) {
     sources -= [ "geolocation/empty_wifi_data_provider.cc" ]
   }
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 3421cf084925..5908fdc678f0 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -251,9 +251,11 @@ source_set("common") {
         "gpu/media/vaapi_h264_decoder.h",
         "gpu/media/vaapi_video_decode_accelerator.cc",
         "gpu/media/vaapi_video_decode_accelerator.h",
+        "gpu/media/vaapi_video_encode_accelerator.cc",
+        "gpu/media/vaapi_video_encode_accelerator.h",
         "gpu/media/vaapi_wrapper.cc",
         "gpu/media/vaapi_wrapper.h",
-      ]
+      ] + get_target_outputs(":libva_generate_stubs")
       configs += [
         "//third_party/libva:libva_config",
         "//third_party/libyuv:libyuv_config",
-- 
2.11.4.GIT