Index: components/toolbar/BUILD.gn |
diff --git a/components/toolbar/BUILD.gn b/components/toolbar/BUILD.gn |
index ec98fd48a0367ddeb35c80f8e3d55a9a91d01e2d..08478b45ae46d08282de45a3fcc834e623417880 100644 |
--- a/components/toolbar/BUILD.gn |
+++ b/components/toolbar/BUILD.gn |
@@ -3,50 +3,27 @@ |
# found in the LICENSE file. |
import("//build/config/ui.gni") |
+import("//ui/vector_icons/vector_icons.gni") |
-action("aggregate_vector_icons") { |
- visibility = [ ":*" ] |
- |
- script = "//ui/gfx/vector_icons/aggregate_vector_icons.py" |
+aggregate_vector_icons("toolbar_vector_icons") { |
+ icon_directory = "vector_icons" |
icons = [ |
# TODO(estade): this is the same as ui/gfx/vector_icons/business.icon. Use |
# that one instead once it's been updated from VectorIconId to VectorIcon. |
- "vector_icons/business.icon", |
- "vector_icons/http.1x.icon", |
- "vector_icons/http.icon", |
- "vector_icons/https_invalid.1x.icon", |
- "vector_icons/https_invalid.icon", |
- "vector_icons/https_valid.1x.icon", |
- "vector_icons/https_valid.icon", |
- "vector_icons/https_valid_in_chip.1x.icon", |
- "vector_icons/https_valid_in_chip.icon", |
- "vector_icons/product.1x.icon", |
- "vector_icons/product.icon", |
- "vector_icons/star_active.icon", |
- "vector_icons/star.icon", |
- ] |
- |
- output_cc = "$target_gen_dir/vector_icons.cc" |
- output_h = "$target_gen_dir/vector_icons.h" |
- |
- inputs = icons |
- inputs += [ |
- "vector_icons/vector_icons.cc.template", |
- "vector_icons/vector_icons.h.template", |
- ] |
- outputs = [ |
- output_cc, |
- output_h, |
- ] |
- |
- response_file_contents = rebase_path(icons, root_build_dir) |
- |
- args = [ |
- "--working_directory=" + rebase_path("./vector_icons"), |
- "--file_list={{response_file_name}}", |
- "--output_cc=" + rebase_path(output_cc, root_build_dir), |
- "--output_h=" + rebase_path(output_h, root_build_dir), |
+ "business.icon", |
+ "http.1x.icon", |
+ "http.icon", |
+ "https_invalid.1x.icon", |
+ "https_invalid.icon", |
+ "https_valid.1x.icon", |
+ "https_valid.icon", |
+ "https_valid_in_chip.1x.icon", |
+ "https_valid_in_chip.icon", |
+ "product.1x.icon", |
+ "product.icon", |
+ "star_active.icon", |
+ "star.icon", |
] |
} |
@@ -73,8 +50,8 @@ static_library("toolbar") { |
] |
if (!is_android && !is_ios) { |
- sources += get_target_outputs(":aggregate_vector_icons") |
- deps += [ ":aggregate_vector_icons" ] |
+ sources += get_target_outputs(":toolbar_vector_icons") |
+ deps += [ ":toolbar_vector_icons" ] |
} |
} |