Revert of Create Monochrome-specific repack() targets

chrome/BUILD.gn

 # Copyright 2014 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/buildflag_header.gni")
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/features.gni")
 import("//build/config/locales.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//build/config/win/console_app.gni")
 import("//build/config/win/manifest.gni")
 import("//chrome/chrome_paks.gni")
 import("//chrome/common/features.gni")
 import("//chrome/process_version_rc_template.gni")
 import("//third_party/widevine/cdm/widevine.gni")
 import("//tools/resources/generate_resource_whitelist.gni")
+import("//ui/base/ui_features.gni")
 import("//v8/gni/v8.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 } else if (is_mac) {
   import("//build/compiled_action.gni")
   import("//build/config/mac/rules.gni")
   import("//build/config/mac/symbols.gni")
   import("//build/mac/tweak_info_plist.gni")
   import("//build/util/branding.gni")
@@ skipping 216 matching lines @@
         ]
       }
 
       if (enable_package_mash_services) {
         deps += [ "//chrome/app/mash" ]
         data_deps += [ "//chrome/app:mojo_manifests" ]
       }
     }
 
     # These files are used by the installer so we need a public dep.
-    public_deps += [ ":packed_resources" ]
+    public_deps += [
+      ":packed_extra_resources",
+      ":packed_resources",
+    ]
 
     # Only ChromeOS has precompiled Flash that needs to get copied to the output
     # directory. On other platforms, Flash is either component-updated only or
     # not supported at all.
     if (is_chromeos) {
       deps += [ "//third_party/adobe/flash:flapper_binaries" ]
     }
 
     data_deps += [ "//third_party/widevine/cdm:widevinecdmadapter" ]
 
@@ skipping 461 matching lines @@
       # can't deal with .icns files.
       "app/theme/default_100_percent/$branding_path_component/product_logo_32.png",
       "browser/mac/install.sh",
     ]
 
     outputs = [
       "{{bundle_resources_dir}}/{{source_file_part}}",
     ]
 
     public_deps = [
+      ":packed_extra_resources",
       ":packed_resources",
       "//chrome/app_shim:app_mode_loader",
     ]
 
     if (enable_mac_keystone) {
       sources += [
         "browser/mac/keystone_promote_postflight.sh",
         "browser/mac/keystone_promote_preflight.sh",
       ]
     }
@@ skipping 593 matching lines @@
     ]
   }
 
   if (is_chrome_branded && !is_mac && !is_android) {
     public_deps = [
       ":default_apps",
     ]
   }
 }
 
+chrome_extra_paks("packed_extra_resources") {
+  if (is_mac) {
+    output_dir = "$root_gen_dir/repack"
+    copy_data_to_bundle = true
+  } else {
+    output_dir = root_out_dir
+  }
+
+  copy_data_to_bundle = is_mac
+  if (enable_resource_whitelist_generation) {
+    repack_whitelist = chrome_resource_whitelist
+    deps = [
+      ":resource_whitelist",
+    ]
+  }
+}
+
 repack("browser_tests_pak") {
   sources = [
     "$root_gen_dir/chrome/options_test_resources.pak",
     "$root_gen_dir/chrome/webui_test_resources.pak",
   ]
   output = "$root_out_dir/browser_tests.pak"
   deps = [
     "//chrome/browser/resources:options_test_resources",
     "//chrome/test/data:webui_test_resources",
   ]
@@ skipping 164 matching lines @@
       "//chrome/app/theme/$branding_path_component/product_logo_48.png",
       "//chrome/tools/build/linux/chrome-wrapper",
       "//third_party/xdg-utils/scripts/xdg-mime",
       "//third_party/xdg-utils/scripts/xdg-settings",
     ]
     outputs = [
       "$root_out_dir/{{source_file_part}}",
     ]
   }
 }