[CRD iOS] Provide a separate system_icons bundle for colliding icons

remoting/ios/app/resources/BUILD.gn

 # Copyright 2017 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/ios/rules.gni")
 import("//remoting/build/config/remoting_build.gni")
 
 bundle_data("assets") {
   sources = [
@@ skipping 13 matching lines @@
     "Assets.xcassets/ic_arrow_forward_white.imageset/ic_arrow_forward_white_2x.png",
     "Assets.xcassets/ic_arrow_forward_white.imageset/ic_arrow_forward_white_3x.png",
     "Assets.xcassets/ic_check_box.imageset/Contents.json",
     "Assets.xcassets/ic_check_box.imageset/ic_check_box_white_1x_ios_24dp.png",
     "Assets.xcassets/ic_check_box.imageset/ic_check_box_white_2x_ios_24dp.png",
     "Assets.xcassets/ic_check_box.imageset/ic_check_box_white_3x_ios_24dp.png",
     "Assets.xcassets/ic_check_box_outline_blank.imageset/Contents.json",
     "Assets.xcassets/ic_check_box_outline_blank.imageset/ic_check_box_outline_blank_white_1x_ios_24dp.png",
     "Assets.xcassets/ic_check_box_outline_blank.imageset/ic_check_box_outline_blank_white_2x_ios_24dp.png",
     "Assets.xcassets/ic_check_box_outline_blank.imageset/ic_check_box_outline_blank_white_3x_ios_24dp.png",
-    "Assets.xcassets/ic_close.imageset/Contents.json",
-    "Assets.xcassets/ic_close.imageset/ic_close_white_1x_ios_24dp.png",
-    "Assets.xcassets/ic_close.imageset/ic_close_white_2x_ios_24dp.png",
-    "Assets.xcassets/ic_close.imageset/ic_close_white_3x_ios_24dp.png",
     "Assets.xcassets/ic_desktop.imageset/Contents.json",
     "Assets.xcassets/ic_desktop.imageset/ic_desktop.png",
     "Assets.xcassets/ic_desktop.imageset/ic_desktop@2x.png",
     "Assets.xcassets/ic_desktop.imageset/ic_desktop@3x.png",
     "Assets.xcassets/ic_desktop_windows.imageset/Contents.json",
     "Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows.png",
     "Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows@2x.png",
     "Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows@3x.png",
     "Assets.xcassets/ic_fullscreen.imageset/Contents.json",
     "Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen.png",
@@ skipping 12 matching lines @@
     "Assets.xcassets/ic_mouse.imageset/ic_mouse@2x.png",
     "Assets.xcassets/ic_mouse.imageset/ic_mouse@3x.png",
     "Assets.xcassets/ic_radio_button_checked.imageset/Contents.json",
     "Assets.xcassets/ic_radio_button_checked.imageset/ic_radio_button_checked_white_1x_ios_24dp.png",
     "Assets.xcassets/ic_radio_button_checked.imageset/ic_radio_button_checked_white_2x_ios_24dp.png",
     "Assets.xcassets/ic_radio_button_checked.imageset/ic_radio_button_checked_white_3x_ios_24dp.png",
     "Assets.xcassets/ic_radio_button_unchecked.imageset/Contents.json",
     "Assets.xcassets/ic_radio_button_unchecked.imageset/ic_radio_button_unchecked_white_1x_ios_24dp.png",
     "Assets.xcassets/ic_radio_button_unchecked.imageset/ic_radio_button_unchecked_white_2x_ios_24dp.png",
     "Assets.xcassets/ic_radio_button_unchecked.imageset/ic_radio_button_unchecked_white_3x_ios_24dp.png",
-    "Assets.xcassets/ic_refresh.imageset/Contents.json",
-    "Assets.xcassets/ic_refresh.imageset/ic_refresh_white.png",
-    "Assets.xcassets/ic_refresh.imageset/ic_refresh_white_2x.png",
-    "Assets.xcassets/ic_refresh.imageset/ic_refresh_white_3x.png",
     "Assets.xcassets/ic_touch_app.imageset/Contents.json",
     "Assets.xcassets/ic_touch_app.imageset/ic_touch_app.png",
     "Assets.xcassets/ic_touch_app.imageset/ic_touch_app_2x.png",
     "Assets.xcassets/ic_touch_app.imageset/ic_touch_app_3x.png",
   ]
   outputs = [
     "{{bundle_resources_dir}}/{{source_file_part}}",
   ]
 }
 
+# TODO(yuweih): This target is used to exclude material design imagesets from
+# the internal app's source set, that are already pulled-in by other deps of the
+# internal app. We will need to redesign these once crbug.com/734054 is
+# resolved.
+bundle_data("system_icons") {
+  sources = [
+    "system_icons.xcassets/ic_close.imageset/Contents.json",
+    "system_icons.xcassets/ic_close.imageset/ic_close_white_1x_ios_24dp.png",
+    "system_icons.xcassets/ic_close.imageset/ic_close_white_2x_ios_24dp.png",
+    "system_icons.xcassets/ic_close.imageset/ic_close_white_3x_ios_24dp.png",
+    "system_icons.xcassets/ic_refresh.imageset/Contents.json",
+    "system_icons.xcassets/ic_refresh.imageset/ic_refresh_white.png",
+    "system_icons.xcassets/ic_refresh.imageset/ic_refresh_white_2x.png",
+    "system_icons.xcassets/ic_refresh.imageset/ic_refresh_white_3x.png",
+  ]
+  outputs = [
+    "{{bundle_resources_dir}}/{{source_file_part}}",
+  ]
+}
+
 bundle_data("launchscreen_assets") {
   sources = [
     "launchscreen_images.xcassets/Contents.json",
     "launchscreen_images.xcassets/launchscreen_app_logo.imageset/Contents.json",
     "launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo.png",
     "launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@2x.png",
     "launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@3x.png",
     "launchscreen_images.xcassets/launchscreen_brand_name.imageset/Contents.json",
     "launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name.png",
     "launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@2x.png",
@@ skipping 14 matching lines @@
     "chromium/Icon-40.png",
     "chromium/Icon-58.png",
     "chromium/Icon-76.png",
     "chromium/Icon-80.png",
     "chromium/Icon-87.png",
   ]
   outputs = [
     "{{bundle_resources_dir}}/{{source_file_part}}",
   ]
 }