| Index: ui/views/BUILD.gn
|
| diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
|
| index 39ebd400ff318befd803d00b226fe3e9b7a9d2db..fd6db351971f8d6b7ce3e92934913e009b6f5afe 100644
|
| --- a/ui/views/BUILD.gn
|
| +++ b/ui/views/BUILD.gn
|
| @@ -7,57 +7,34 @@ import("//build/config/ui.gni")
|
| import("//testing/test.gni")
|
| import("//ui/base/ui_features.gni")
|
| import("//ui/ozone/ozone.gni")
|
| +import("//ui/vector_icons/vector_icons.gni")
|
|
|
| config("flags") {
|
| defines = [ "TOOLKIT_VIEWS=1" ]
|
| }
|
|
|
| -action("aggregate_vector_icons") {
|
| - visibility = [ ":*" ]
|
| -
|
| - script = "//ui/gfx/vector_icons/aggregate_vector_icons.py"
|
| +aggregate_vector_icons("views_vector_icons") {
|
| + icon_directory = "vector_icons"
|
|
|
| icons = [
|
| - "vector_icons/checkbox_active.icon",
|
| - "vector_icons/checkbox_normal.icon",
|
| - "vector_icons/menu_check.1x.icon",
|
| - "vector_icons/menu_check.icon",
|
| - "vector_icons/menu_radio_empty.icon",
|
| - "vector_icons/menu_radio_selected.icon",
|
| - "vector_icons/radio_button_active.icon",
|
| - "vector_icons/radio_button_normal.icon",
|
| - "vector_icons/submenu_arrow.1x.icon",
|
| - "vector_icons/submenu_arrow.icon",
|
| + "checkbox_active.icon",
|
| + "checkbox_normal.icon",
|
| + "menu_check.1x.icon",
|
| + "menu_check.icon",
|
| + "menu_radio_empty.icon",
|
| + "menu_radio_selected.icon",
|
| + "radio_button_active.icon",
|
| + "radio_button_normal.icon",
|
| + "submenu_arrow.1x.icon",
|
| + "submenu_arrow.icon",
|
| ]
|
|
|
| if (is_mac) {
|
| icons += [
|
| - "vector_icons/combobox_arrow_mac_enabled.icon",
|
| - "vector_icons/combobox_arrow_mac_disabled.icon",
|
| + "combobox_arrow_mac_enabled.icon",
|
| + "combobox_arrow_mac_disabled.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),
|
| - ]
|
| }
|
|
|
| component("views") {
|
| @@ -433,7 +410,7 @@ component("views") {
|
| "word_lookup_client.h",
|
| ]
|
|
|
| - sources += get_target_outputs(":aggregate_vector_icons")
|
| + sources += get_target_outputs(":views_vector_icons")
|
|
|
| configs += [
|
| "//build/config:precompiled_headers",
|
| @@ -445,7 +422,7 @@ component("views") {
|
| defines = [ "VIEWS_IMPLEMENTATION" ]
|
|
|
| deps = [
|
| - ":aggregate_vector_icons",
|
| + ":views_vector_icons",
|
| "//base:i18n",
|
| "//base/third_party/dynamic_annotations",
|
| "//cc/paint",
|
|
|