Toolbar: Do not include vector icons if on Android with no VR.

components/toolbar/BUILD.gn

Index: components/toolbar/BUILD.gn
diff --git a/components/toolbar/BUILD.gn b/components/toolbar/BUILD.gn
index d10a79f3eae9fedbb8892a9a456db1e111f2ca7c..e06ea275ee28e6373e8f630717f0a76cd9203c88 100644
--- a/components/toolbar/BUILD.gn
+++ b/components/toolbar/BUILD.gn
@@ -2,9 +2,16 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/buildflag_header.gni")
 import("//build/config/ui.gni")
+import("//device/vr/features/features.gni")
 import("//ui/vector_icons/vector_icons.gni")
 
+buildflag_header("build_features") {
+  header = "features.h"
+  flags = [ "ENABLE_VR=$enable_vr" ]
+}
+
 aggregate_vector_icons("toolbar_vector_icons") {
   icon_directory = "vector_icons"
 
@@ -36,6 +43,7 @@ static_library("vector_icons") {
 
 static_library("toolbar") {
   sources = [
+    "features.h",
     "toolbar_model.h",
     "toolbar_model_delegate.h",
     "toolbar_model_impl.cc",
@@ -49,6 +57,7 @@ static_library("toolbar") {
   ]
 
   deps = [
+    ":build_features",
     "//components/google/core/browser",
     "//components/prefs",
     "//components/resources",
@@ -59,7 +68,7 @@ static_library("toolbar") {
     "//ui/gfx",
   ]
 
-  if (!is_ios) {
+  if (!(is_android && !enable_vr) && !is_ios) {

[Peter Kasting, 2017/06/29 17:33:58]

Nit: This nested !s expression is kinda hard to understand.  What about:

  if ((!is_android || enable_vr) && !is_ios)

[cjgrant, 2017/06/29 21:13:22]

Done.

     deps += [ ":vector_icons" ]
   }
 }