Reland "Adjust aggregate_vector_icons GN template."

This reverts commit f56db26f.

Reason for revert: breakage was already fixed in 1df2fd67

Original change's description:
> Revert "Adjust aggregate_vector_icons GN template."
>
> This reverts commit 6197ec27.
>
> Reason for revert: Broke chromeos-betty-pi-arc-cfi-thin-lto-chrome
>
> BUG=1133015
>
> Original change's description:
> > Adjust aggregate_vector_icons GN template.
> >
> > Change the name of the icon list from `icons` to `sources`. This makes
> > gn format alphabetize the list.
> >
> > Bug: 1132894
> > Change-Id: I8dfe07d74fa2ddfd32ef8bec8729923e999a640e
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427135
> > Commit-Queue: Evan Stade <estade@chromium.org>
> > Reviewed-by: Scott Violet <sky@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#811364}
>
> TBR=sky@chromium.org,estade@chromium.org
>
> Change-Id: I69cd779577af70125c23f4b6085d62d97ec231fc
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1132894
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2436394
> Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
> Commit-Queue: Ahmed Fakhry <afakhry@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#811389}

TBR=sky@chromium.org,estade@chromium.org,afakhry@chromium.org

# Not skipping CQ checks because this is a reland.

Bug: 1133015
Bug: 1132894
Change-Id: I73199d77ecb5dd156ef89a40dcc26581841b12cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2436892Reviewed-by: Evan Stade <estade@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811394}

ash/public/cpp/app_list/vector_icons/BUILD.gn

@@ -4,10 +4,10 @@
 
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons("app_list_vector_icons") {
+aggregate_vector_icons2("app_list_vector_icons") {
   icon_directory = "."
 
-  icons = [
+  sources = [
     "arrow_up.icon",
     "badge_instant.icon",
     "badge_play.icon",

ash/resources/vector_icons/BUILD.gn

@@ -5,10 +5,10 @@
 import("//build/config/chrome_build.gni")
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons("ash_vector_icons") {
+aggregate_vector_icons2("ash_vector_icons") {
   icon_directory = "."
 
-  icons = [
+  sources = [
     "always_show_shelf.icon",
     "auto_hide.icon",
     "autoclick.icon",
@@ -16,12 +16,12 @@ aggregate_vector_icons("ash_vector_icons") {
     "autoclick_double_click.icon",
     "autoclick_drag.icon",
     "autoclick_left_click.icon",
-    "autoclick_right_click.icon",
     "autoclick_pause.icon",
     "autoclick_position_bottom_left.icon",
     "autoclick_position_bottom_right.icon",
     "autoclick_position_top_left.icon",
     "autoclick_position_top_right.icon",
+    "autoclick_right_click.icon",
     "autoclick_scroll.icon",
     "autoclick_scroll_down.icon",
     "autoclick_scroll_left.icon",
@@ -64,17 +64,17 @@ aggregate_vector_icons("ash_vector_icons") {
     "lock_screen_caps_lock.icon",
     "lock_screen_dropdown.icon",
     "lock_screen_fingerprint.icon",
+    "lock_screen_fingerprint_success.icon",
     "lock_screen_password_invisible.icon",
     "lock_screen_password_visible.icon",
     "lock_screen_smart_card.icon",
     "lock_screen_smart_card_failure.icon",
-    "lock_screen_fingerprint_success.icon",
     "lock_screen_time_limit_lock.icon",
     "lock_screen_time_limit_moon.icon",
     "lock_screen_time_limit_timer.icon",
     "login_screen_button_dropdown.icon",
-    "login_screen_menu_dropdown.icon",
     "login_screen_enterprise.icon",
+    "login_screen_menu_dropdown.icon",
     "mic.icon",
     "muted_microphone.icon",
     "network_badge_captive_portal.icon",
@@ -100,8 +100,8 @@ aggregate_vector_icons("ash_vector_icons") {
     "notification_battery_critical.icon",
     "notification_battery_fluctuating.icon",
     "notification_battery_low.icon",
-    "notification_bluetooth_battery_warning.icon",
     "notification_bluetooth.icon",
+    "notification_bluetooth_battery_warning.icon",
     "notification_capslock.icon",
     "notification_center_all_done.icon",
     "notification_center_clear_all.icon",
@@ -121,10 +121,10 @@ aggregate_vector_icons("ash_vector_icons") {
     "notification_sms_sync.icon",
     "notification_stylus_battery_warning.icon",
     "notification_timer.icon",
-    "overview_window_close.icon",
-    "overview_drop_target_plus.icon",
     "overflow_shelf_left.icon",
     "overflow_shelf_right.icon",
+    "overview_drop_target_plus.icon",
+    "overview_window_close.icon",
     "palette_action_capture_region.icon",
     "palette_action_capture_screen.icon",
     "palette_action_create_note.icon",
@@ -137,10 +137,10 @@ aggregate_vector_icons("ash_vector_icons") {
     "palette_tray_icon_laser_pointer.icon",
     "palette_tray_icon_magnify.icon",
     "palette_tray_icon_metalayer.icon",
-    "pin_request_lock.icon",
-    "pinned.icon",
     "phone_hub_mobile_no_connection.icon",
     "phone_hub_mobile_no_sim.icon",
+    "pin_request_lock.icon",
+    "pinned.icon",
     "privacy_screen.icon",
     "send.icon",
     "settings.icon",
@@ -194,10 +194,10 @@ aggregate_vector_icons("ash_vector_icons") {
     "system_menu_accessibility_docked_magnifier.icon",
     "system_menu_accessibility_fullscreen_magnifier.icon",
     "system_menu_accessibility_select_to_speak.icon",
-    "system_menu_audio_input.icon",
-    "system_menu_audio_output.icon",
     "system_menu_add_connection.icon",
     "system_menu_arrow_back.icon",
+    "system_menu_audio_input.icon",
+    "system_menu_audio_output.icon",
     "system_menu_bluetooth.icon",
     "system_menu_bluetooth_connected.icon",
     "system_menu_bluetooth_disabled.icon",
@@ -222,6 +222,7 @@ aggregate_vector_icons("ash_vector_icons") {
     "system_menu_legacy_supervised_user.icon",
     "system_menu_lock.icon",
     "system_menu_mouse.icon",
+    "system_menu_new_user.icon",
     "system_menu_phone.icon",
     "system_menu_power.icon",
     "system_menu_rollback.icon",
@@ -232,9 +233,8 @@ aggregate_vector_icons("ash_vector_icons") {
     "system_menu_settings.icon",
     "system_menu_supervised_user.icon",
     "system_menu_tablet.icon",
-    "system_menu_tracing.icon",
     "system_menu_timer.icon",
-    "system_menu_new_user.icon",
+    "system_menu_tracing.icon",
     "system_menu_update.icon",
     "system_menu_usb.icon",
     "system_menu_videocam.icon",
@@ -251,19 +251,19 @@ aggregate_vector_icons("ash_vector_icons") {
     "system_tray_caps_lock.icon",
     "system_tray_cast.icon",
     "system_tray_do_not_disturb.icon",
-    "system_tray_supervised_user.icon",
     "system_tray_managed.icon",
     "system_tray_notification_counter_plus.icon",
     "system_tray_recording.icon",
     "system_tray_rotation_lock_auto.icon",
     "system_tray_rotation_lock_locked.icon",
+    "system_tray_screen_share.icon",
     "system_tray_select_to_speak.icon",
-    "system_tray_select_to_speak_newui.icon",
     "system_tray_select_to_speak_active.icon",
     "system_tray_select_to_speak_active_newui.icon",
-    "system_tray_screen_share.icon",
+    "system_tray_select_to_speak_newui.icon",
     "system_tray_stop.icon",
     "system_tray_stop_newui.icon",
+    "system_tray_supervised_user.icon",
     "system_tray_tracing.icon",
     "system_tray_update.icon",
     "system_tray_volume_mute.icon",
@@ -280,16 +280,16 @@ aggregate_vector_icons("ash_vector_icons") {
     "unified_menu_battery_unreliable_outline.icon",
     "unified_menu_battery_x.icon",
     "unified_menu_battery_x_outline.icon",
-    "unified_menu_bluetooth_connected.icon",
     "unified_menu_bluetooth.icon",
+    "unified_menu_bluetooth_connected.icon",
     "unified_menu_brightness.icon",
     "unified_menu_cast.icon",
     "unified_menu_dark_mode.icon",
     "unified_menu_do_not_disturb.icon",
     "unified_menu_expand.icon",
     "unified_menu_info.icon",
-    "unified_menu_keyboard_brightness.icon",
     "unified_menu_keyboard.icon",
+    "unified_menu_keyboard_brightness.icon",
     "unified_menu_locale.icon",
     "unified_menu_lock.icon",
     "unified_menu_managed.icon",

ash/shortcut_viewer/vector_icons/BUILD.gn

@@ -4,15 +4,10 @@
 
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons("ksv_vector_icons") {
+aggregate_vector_icons2("ksv_vector_icons") {
   icon_directory = "."
 
-  icons = [
-    "ksv_search_back.icon",
-    "ksv_search_bar.icon",
-    "ksv_search_close.icon",
-    "ksv_search_no_result.icon",
-    "ksv_separator_plus.icon",
+  sources = [
     "ksv_arrow_down.icon",
     "ksv_arrow_left.icon",
     "ksv_arrow_right.icon",
@@ -26,6 +21,11 @@ aggregate_vector_icons("ksv_vector_icons") {
     "ksv_overview.icon",
     "ksv_privacy_screen_toggle.icon",
     "ksv_reload.icon",
+    "ksv_search_back.icon",
+    "ksv_search_bar.icon",
+    "ksv_search_close.icon",
+    "ksv_search_no_result.icon",
+    "ksv_separator_plus.icon",
     "ksv_volume_down.icon",
     "ksv_volume_up.icon",
   ]

chrome/app/vector_icons/BUILD.gn

@@ -7,11 +7,12 @@ import("//components/vector_icons/vector_icons.gni")
 import("//device/vr/buildflags/buildflags.gni")
 import("//ui/webui/webui_features.gni")
 
-aggregate_vector_icons("chrome_vector_icons") {
+aggregate_vector_icons2("chrome_vector_icons") {
   icon_directory = "."
 
   # Keep sorted alphabetically.
-  icons = [
+  sources = [
+    "${branding_path_component}/product.icon",
     "account_box.icon",
     "account_child.icon",
     "account_child_circle.icon",
@@ -42,6 +43,8 @@ aggregate_vector_icons("chrome_vector_icons") {
     "default_touch_favicon_mask.icon",
     "eol.icon",
     "extension_crashed.icon",
+    "eye.icon",
+    "eye_crossed.icon",
     "file_download_shelf.icon",
     "fingerprint.icon",
     "forward_arrow_touch.icon",
@@ -75,8 +78,8 @@ aggregate_vector_icons("chrome_vector_icons") {
     "person_filled_padded_large.icon",
     "person_filled_padded_small.icon",
     "photo_camera.icon",
-    "picture_in_picture_control_background.icon",
     "picture_in_picture_alt.icon",
+    "picture_in_picture_control_background.icon",
     "qrcode_generator.icon",
     "read_later.icon",
     "read_later_add.icon",
@@ -89,10 +92,8 @@ aggregate_vector_icons("chrome_vector_icons") {
     "sad_tab.icon",
     "security.icon",
     "send_tab_to_self.icon",
-    "eye_crossed.icon",
-    "eye.icon",
-    "signin_button_drop_down_arrow.icon",
     "sign_out.icon",
+    "signin_button_drop_down_arrow.icon",
     "smartphone.icon",
     "speaker.icon",
     "speaker_group.icon",
@@ -144,18 +145,17 @@ aggregate_vector_icons("chrome_vector_icons") {
     "webauthn/webauthn_welcome_dark.icon",
     "zoom_minus.icon",
     "zoom_plus.icon",
-    "${branding_path_component}/product.icon",
   ]
 
   if (is_mac) {
-    icons += [
+    sources += [
       "default_favicon.icon",
       "new_tab_mac_touchbar.icon",
     ]
   }
 
   if (is_win) {
-    icons += [
+    sources += [
       "back_arrow_windows.icon",
       "back_arrow_windows_touch.icon",
       "inactive_toast_arrow.icon",
@@ -170,10 +170,10 @@ aggregate_vector_icons("chrome_vector_icons") {
   }
 
   if (is_chromeos) {
-    icons += [
+    sources += [
       "autocorrect_undo.icon",
-      "notification_captive_portal.icon",
       "notification_battery.icon",
+      "notification_captive_portal.icon",
       "notification_cellular_alert.icon",
       "notification_download.icon",
       "notification_end_of_support.icon",
@@ -191,8 +191,8 @@ aggregate_vector_icons("chrome_vector_icons") {
       "notification_printing_warning.icon",
       "notification_storage_full.icon",
       "notification_vpn.icon",
-      "notification_wifi_off.icon",
       "notification_wifi.icon",
+      "notification_wifi_off.icon",
       "person_add.icon",
       "shutdown_guest_os.icon",
       "warning_badge_circle.icon",
@@ -200,27 +200,27 @@ aggregate_vector_icons("chrome_vector_icons") {
   }
 
   if (!is_android) {
-    icons += [ "nearby_share.icon" ]
+    sources += [ "nearby_share.icon" ]
   }
 
   if (enable_vr && !is_android) {
     # Used on desktop VR headsets and Linux unit tests.
-    icons += [ "open_in_browser.icon" ]
+    sources += [ "open_in_browser.icon" ]
   }
 
   if (enable_webui_tab_strip) {
-    icons += [ "new_tab_toolbar_button.icon" ]
+    sources += [ "new_tab_toolbar_button.icon" ]
   }
 
   if (is_chrome_branded) {
-    icons += [
+    sources += [
       "google_chrome/google_g_logo.icon",
       "google_chrome/google_pay_logo.icon",
     ]
   }
 
   if (is_chrome_branded && is_chromeos) {
-    icons += [ "google_chrome/assistant.icon" ]
+    sources += [ "google_chrome/assistant.icon" ]
   }
 }
 

chrome/browser/vr/vector_icons/BUILD.gn

@@ -4,12 +4,12 @@
 
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons("vr_vector_icons") {
+aggregate_vector_icons2("vr_vector_icons") {
   icon_directory = "."
 
-  icons = [
-    "daydream_controller_home_button.icon",
+  sources = [
     "daydream_controller_app_button.icon",
+    "daydream_controller_home_button.icon",
     "file_download_done.icon",
     "more_vert.icon",
     "my_location.icon",

chromecast/ui/BUILD.gn

@@ -105,10 +105,10 @@ if (use_aura) {
 # Rules for generating vector icon source files.
 # Adapted from //components/vector_icons/BUILD.gn
 
-aggregate_vector_icons("media_controls_vector_icons") {
+aggregate_vector_icons2("media_controls_vector_icons") {
   icon_directory = "vector_icons"
 
-  icons = [
+  sources = [
     "back30.icon",
     "forward30.icon",
     "next.icon",

chromeos/ui/vector_icons/BUILD.gn

@@ -6,10 +6,10 @@ import("//components/vector_icons/vector_icons.gni")
 
 # The icons in this target, unlike those in //ash/resources/vector_icons,
 # are ok to use from outside of ash/, eg lacros builds.
-aggregate_vector_icons("chromeos_ui_vector_icons") {
+aggregate_vector_icons2("chromeos_ui_vector_icons") {
   icon_directory = "."
 
-  icons = [
+  sources = [
     "assistant.icon",
     "calculate.icon",
     "conversion_path.icon",

components/media_message_center/vector_icons/BUILD.gn

@@ -4,18 +4,18 @@
 
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons("media_vector_icons") {
+aggregate_vector_icons2("media_vector_icons") {
   icon_directory = "."
 
-  icons = [
+  sources = [
     "media_enter_pip.icon",
     "media_exit_pip.icon",
     "media_next_track.icon",
     "media_previous_track.icon",
-    "media_seek_forward.icon",
     "media_seek_backward.icon",
-    "play_arrow.icon",
+    "media_seek_forward.icon",
     "pause.icon",
+    "play_arrow.icon",
   ]
 }
 

components/omnibox/browser/BUILD.gn

@@ -18,10 +18,10 @@ buildflag_header("buildflags") {
   flags = [ "ENABLE_VR=$enable_vr" ]
 }
 
-aggregate_vector_icons("omnibox_vector_icons") {
+aggregate_vector_icons2("omnibox_vector_icons") {
   icon_directory = "vector_icons"
 
-  icons = [
+  sources = [
     "answer_calculator.icon",
     "answer_currency.icon",
     "answer_default.icon",
@@ -59,8 +59,8 @@ aggregate_vector_icons("omnibox_vector_icons") {
     "pedal.icon",
     "plus.icon",
     "product.icon",
-    "star_active.icon",
     "star.icon",
+    "star_active.icon",
     "switch.icon",
     "tab.icon",
     "trending_up.icon",

components/vector_icons/BUILD.gn

@@ -4,10 +4,10 @@
 
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons("components_vector_icons") {
+aggregate_vector_icons2("components_vector_icons") {
   icon_directory = "."
 
-  icons = [
+  sources = [
     "accessibility.icon",
     "ads.icon",
     "back_arrow.icon",

components/vector_icons/vector_icons.gni

@@ -8,7 +8,7 @@
 #
 # Parameters
 #
-#   icons (required)
+#   sources (required)
 #       A list of icon filenames to use as inputs.
 #
 #   icon_directory (required)
@@ -21,6 +21,50 @@
 # Example
 #
 #   See BUILD.gn in this directory (//components/vector_icons/) for an example.
+#
+# TODO(estade): rename to aggregate_vector_icons after all clients are updated.
+template("aggregate_vector_icons2") {
+  assert(defined(invoker.sources),
+         "Need sources in $target_name listing the icon files.")
+  assert(
+      defined(invoker.icon_directory),
+      "Need icon_directory in $target_name where the icons and templates live.")
+
+  action(target_name) {
+    visibility = [ ":*" ]
+
+    script = "//components/vector_icons/aggregate_vector_icons.py"
+
+    output_cc = "$target_gen_dir/vector_icons.cc"
+    output_h = "$target_gen_dir/vector_icons.h"
+
+    templates = [
+      "vector_icons.cc.template",
+      "vector_icons.h.template",
+    ]
+    inputs =
+        rebase_path(templates + invoker.sources, ".", invoker.icon_directory) +
+        [ "//components/vector_icons/aggregate_vector_icons.py" ]
+
+    outputs = [
+      output_cc,
+      output_h,
+    ]
+
+    response_file_contents =
+        rebase_path(invoker.sources, root_build_dir, invoker.icon_directory)
+
+    args = [
+      "--working_directory=" +
+          rebase_path(invoker.icon_directory, root_build_dir),
+      "--file_list={{response_file_name}}",
+      "--output_cc=" + rebase_path(output_cc, root_build_dir),
+      "--output_h=" + rebase_path(output_h, root_build_dir),
+    ]
+  }
+}
+
+# Deprecated version. TODO(estade): remove when all clients are updated.
 template("aggregate_vector_icons") {
   assert(defined(invoker.icons),
          "Need icons in $target_name listing the icon files.")

ui/message_center/BUILD.gn

@@ -15,10 +15,10 @@ import("//ui/base/ui_features.gni")
 import("//build/config/deprecated_default_sources_assignment_filter.gni")
 set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
 
-aggregate_vector_icons("message_center_vector_icons") {
+aggregate_vector_icons2("message_center_vector_icons") {
   icon_directory = "vector_icons"
 
-  icons = [
+  sources = [
     "notification_close_button.icon",
     "notification_expand_less.icon",
     "notification_expand_more.icon",

ui/views/BUILD.gn

@@ -17,10 +17,10 @@ config("flags") {
   defines = [ "TOOLKIT_VIEWS=1" ]
 }
 
-aggregate_vector_icons("views_vector_icons") {
+aggregate_vector_icons2("views_vector_icons") {
   icon_directory = "vector_icons"
 
-  icons = [
+  sources = [
     "checkbox_active.icon",
     "checkbox_normal.icon",
     "close.icon",

ui/views/window/vector_icons/BUILD.gn

@@ -4,10 +4,10 @@
 
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons("window_control_vector_icons") {
+aggregate_vector_icons2("window_control_vector_icons") {
   icon_directory = "."
 
-  icons = [
+  sources = [
     "window_control_close.icon",
     "window_control_maximize.icon",
     "window_control_minimize.icon",