Move Ash-specific vector icons to ash/common/resources

ash/BUILD.gn

 # Copyright 2014 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/config/features.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//ui/base/ui_features.gni")
 
 assert(use_aura)
 assert(enable_hidpi)
 
 gypi_values = exec_script("//build/gypi_to_gn.py",
                           [ rebase_path("ash.gyp") ],
                           "scope",
                           [ "ash.gyp" ])
 
+vector_icons_sources_gypi =
+    exec_script("//build/gypi_to_gn.py",
+                [ rebase_path("common/resources/vector_icons_sources.gypi") ],

[sadrul, 2016/08/30 19:31:08]

This gypi is not used anywhere else, so just list the files in this gn file. (or
some gni file and import that from this file)

[oshima, 2016/08/31 00:11:44]

+1

[tdanderson, 2016/08/31 22:18:20]

Done.

+                "scope",
+                [ "common/resources/vector_icons_sources.gypi" ])
+
+vector_icons_cc_file = "$target_gen_dir/common/resources/vector_icons.cc"
+vector_icons_h_file = "$target_gen_dir/common/resources/vector_icons.h"
+
 component("ash") {
   sources = gypi_values.ash_sources
 
+  sources += [
+    vector_icons_cc_file,
+    vector_icons_h_file,
+  ]
+
   configs += [ "//build/config:precompiled_headers" ]
   defines = [ "ASH_IMPLEMENTATION" ]
 
   public_deps = [
     "//ash/common/strings",
     "//ash/resources",
   ]
   deps = [
+    ":aggregate_vector_icons",
     "//ash/autoclick/common:autoclick",
     "//ash/touch_hud",
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//cc",
     "//components/device_event_log",
     "//components/onc",
     "//components/signin/core/account_id",
     "//components/user_manager",
@@ skipping 105 matching lines @@
   }
 
   if (!use_ozone) {
     sources -= [
       "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
       "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
     ]
   }
 }
 
+action("aggregate_vector_icons") {
+  script = "//ui/gfx/vector_icons/aggregate_vector_icons.py"
+  inputs = vector_icons_sources_gypi.ash
+
+  outputs = [
+    vector_icons_cc_file,
+    vector_icons_h_file,
+  ]
+
+  response_file_contents = rebase_path(inputs, root_build_dir)
+
+  args = [
+    "--working_directory=" + rebase_path("common/resources/vector_icons/"),
+    "--file_list={{response_file_name}}",
+    "--output_cc=" + rebase_path(vector_icons_cc_file, root_build_dir),
+    "--output_h=" + rebase_path(vector_icons_h_file, root_build_dir),
+  ]
+}
+
 component("ash_with_content") {
   sources = gypi_values.ash_with_content_sources
 
   defines = [ "ASH_WITH_CONTENT_IMPLEMENTATION" ]
 
   public_deps = [
     ":ash",
   ]
   deps = [
     "//base",
@@ skipping 324 matching lines @@
     configs += [ "//build/config/win:windowed" ]
     deps += [ "//sandbox" ]
   }
 
   if (is_chromeos) {
     deps += [ "//device/bluetooth" ]
   }
 }
 # When adding support for isolates, please have a look at run-time dependencies
 # in the ash_unittests_run target in ash.gyp.