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

components/toolbar/BUILD.gn

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # 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"
 
   icons = [
     "http.1x.icon",
     "http.icon",
     "https_invalid.1x.icon",
     "https_invalid.icon",
     "https_valid.1x.icon",
     "https_valid.icon",
@@ skipping 11 matching lines @@
   deps = [
     ":toolbar_vector_icons",
     "//skia",
     "//ui/gfx",
     "//ui/vector_icons",
   ]
 }
 
 static_library("toolbar") {
   sources = [
+    "features.h",
     "toolbar_model.h",
     "toolbar_model_delegate.h",
     "toolbar_model_impl.cc",
     "toolbar_model_impl.h",
   ]
 
   public_deps = [
     "//base",
     "//components/security_state/core",
     "//url",
   ]
 
   deps = [
+    ":build_features",
     "//components/google/core/browser",
     "//components/prefs",
     "//components/resources",
     "//components/strings",
     "//components/url_formatter",
     "//net",
     "//ui/base",
     "//ui/gfx",
   ]
 
-  if (!is_ios) {
+  if ((!is_android || enable_vr) && !is_ios) {
     deps += [ ":vector_icons" ]
   }
 }
 
 static_library("test_support") {
   testonly = true
 
   sources = [
     "test_toolbar_model.cc",
     "test_toolbar_model.h",
   ]
 
   public_deps = [
     ":toolbar",
     "//base",
   ]
 
   deps = [
     "//components/resources",
     "//ui/gfx",
   ]
 
   if (toolkit_views) {
     # Needed to get the TOOLKIT_VIEWS define.
     deps += [ "//ui/views" ]
   }
 }