Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Unified Diff: ui/views/BUILD.gn

Issue 2653223005: Move views vector icons from source_set to part of views target. (Closed)
Patch Set: rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/BUILD.gn
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index 9307229d9a0fac2f04aa1d43e8c430a61d4aa6b9..bef106ef4e03a6e7d3aad5fb29bbcbf8d1867c65 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -12,6 +12,54 @@ config("flags") {
defines = [ "TOOLKIT_VIEWS=1" ]
}
+action("aggregate_vector_icons") {
+ visibility = [ ":*" ]
+
+ script = "//ui/gfx/vector_icons/aggregate_vector_icons.py"
+
+ 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",
+ ]
+
+ if (is_mac) {
+ icons += [
+ "vector_icons/combobox_arrow_mac_enabled.icon",
+ "vector_icons/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") {
all_dependent_configs = [ ":flags" ]
sources = [
@@ -386,6 +434,8 @@ component("views") {
"word_lookup_client.h",
]
+ sources += get_target_outputs(":aggregate_vector_icons")
+
configs += [
"//build/config:precompiled_headers",
@@ -396,6 +446,7 @@ component("views") {
defines = [ "VIEWS_IMPLEMENTATION" ]
deps = [
+ ":aggregate_vector_icons",
"//base:i18n",
"//base/third_party/dynamic_annotations",
"//services/ui/public/interfaces",
@@ -408,7 +459,6 @@ component("views") {
"//ui/resources",
"//ui/strings",
"//ui/views/resources",
- "//ui/views/resources/vector_icons",
"//url",
]
« no previous file with comments | « chrome/browser/ui/views/payments/payment_sheet_view_controller.cc ('k') | ui/views/controls/button/checkbox.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698