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

ash/BUILD.gn

Index: ash/BUILD.gn
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index 1fbfb15f001780fd9e91c27a8b5e4d86438bad0e..4e02ad910e5e7c78a59a476c325ac7bebbb29fc2 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -15,9 +15,23 @@ gypi_values = exec_script("//build/gypi_to_gn.py",
                           "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" ]
 
@@ -26,6 +40,7 @@ component("ash") {
     "//ash/resources",
   ]
   deps = [
+    ":aggregate_vector_icons",
     "//ash/autoclick/common:autoclick",
     "//ash/touch_hud",
     "//base",
@@ -151,6 +166,25 @@ component("ash") {
   }
 }
 
+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