GN: Fix some breakage for os==chromeos build

build/config/linux/BUILD.gn:
* Usage of generate_library_loader for libbrlapi was incorrect; there
* was nothing provided for "functions". This is now an empty list.

chrome/chrome_common.gypi
chrome/common/BUILD.gn
* Reference to a removed file, chrome_version_info_linux.cc

chromeos/BUILD.gn
components/pairing/BUILD.gn
* Usage of removed proto_{in,out}_dir in proto_library rules.

content/gpu/BUILD.gn
* Typo in reference to third_party/libva:libva_config

ui/views/BUILD.gn
* Attempt to filter source files out of
* gypi_values.views_unittests_sources by subdirectory path. Fortunately
* that variable already doesn't include the files that were supposed
* to be filtered out, so the rule is simply removed.

BUG=388412
TEST=Create a target that builds //mojo/public, build with os==chromeos

R=brettw@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#293964}

7 files changed, 15 insertions, 15 deletions

diff --git a/build/config/linux/BUILD.gn b/build/config/linux/BUILD.gn
index 8342f11..77c4d67 100644
--- a/build/config/linux/BUILD.gn
+++ b/build/config/linux/BUILD.gn
@@ -142,6 +142,20 @@ if (use_brlapi) {
     output_cc = "libbrlapi_loader.cc"
     header = "<brlapi.h>"
     config = ":brlapi_config"
+
+    functions = [
+      "brlapi_getHandleSize",
+      "brlapi_error_location",
+      "brlapi_strerror",
+      "brlapi__acceptKeys",
+      "brlapi__openConnection",
+      "brlapi__closeConnection",
+      "brlapi__getDisplaySize",
+      "brlapi__enterTtyModeWithPath",
+      "brlapi__leaveTtyMode",
+      "brlapi__writeDots",
+      "brlapi__readKey",
+    ]
   }
 }
 
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index fc6986a..1459cf2 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -474,11 +474,6 @@
               'common/local_discovery/local_discovery_messages.h',
             ]
         }],
-        ['chromeos==1', {
-          'sources!': [
-            'common/chrome_version_info_linux.cc',
-          ],
-        }],
         ['OS=="mac"', {
           'dependencies': [
             '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 51c3908..8d6e309 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -193,10 +193,6 @@ static_library("common") {
     sources += [ "local_discovery/local_discovery_messages.h" ]
   }
 
-  if (is_chromeos) {
-    sources -= [ "chrome_version_info_linux.cc" ]
-  }
-
   if (is_mac) {
     sources -= [
       "chrome_version_info_posix.cc",
diff --git a/chromeos/BUILD.gn b/chromeos/BUILD.gn
index 22af317..c237ca1 100644
--- a/chromeos/BUILD.gn
+++ b/chromeos/BUILD.gn
@@ -12,6 +12,4 @@ proto_library("power_manager_proto") {
     "//third_party/cros_system_api/dbus/power_manager/power_supply_properties.proto",
     "//third_party/cros_system_api/dbus/power_manager/suspend.proto",
   ]
-  proto_in_dir = "//third_party/cros_system_api/dbus/power_manager"
-  proto_out_dir = "chromeos/dbus/power_manager"
 }
diff --git a/components/pairing/BUILD.gn b/components/pairing/BUILD.gn
index 02011ef..c381883 100644
--- a/components/pairing/BUILD.gn
+++ b/components/pairing/BUILD.gn
@@ -48,6 +48,4 @@ proto_library("proto") {
   sources = [
     "pairing_api.proto",
   ]
-  'proto_in_dir' = 'pairing'
-  'proto_out_dir' = 'components/pairing'
 }
diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
index eaa2b8e..660354f 100644
--- a/content/gpu/BUILD.gn
+++ b/content/gpu/BUILD.gn
@@ -45,7 +45,7 @@ source_set("gpu") {
   }
 
   if (is_chromeos && cpu_arch != "arm") {
-    configs += [ "//third_party/libva/libva_config" ]
+    configs += [ "//third_party/libva:libva_config" ]
   }
 
   if (use_x11) {
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index a3f3311..609181b 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -168,7 +168,6 @@ test("views_unittests") {
   if (is_chromeos) {
     sources -= [
       "ime/input_method_bridge_unittest.cc",
-      "widget/desktop_aura",
     ]
   }