Delete chrome_framework_locales in favour of copy_data_to_bundle=true

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")
@@ skipping 684 matching lines @@
     # Remove the default strip configuration (which strips all symbols) so that
     # a saves file can be specified.
     if (enable_stripping) {
       remove_configs = [ "//build/config/mac:strip_all" ]
 
       ldflags +=
           [ "-Wcrl,strip,-s," + rebase_path("app/app.saves", root_build_dir) ]
     }
   }
 
-  bundle_data("chrome_framework_locales") {
-    sources = []
-    public_deps = [
-      ":repack_locales_pack",
-    ]
-
-    foreach(locale, locales_as_mac_outputs) {
-      sources += [ "$root_gen_dir/repack/locales/$locale.pak" ]
-    }
-
-    outputs = [
-      "{{bundle_resources_dir}}/{{source_name_part}}.lproj/locale.pak",
-    ]
-  }
-
   bundle_data("chrome_framework_helpers") {
     sources = [
       "$root_out_dir/crashpad_handler",
     ]
 
     outputs = [
       "{{bundle_root_dir}}/Helpers/{{source_file_part}}",
     ]
 
     public_deps = [
       "//third_party/crashpad/crashpad/handler:crashpad_handler",
     ]
 
     if (using_sanitizer) {
       # crashpad_handler requires the ASan runtime at its @executable_path.
       sources += [ "$root_out_dir/libclang_rt.asan_osx_dynamic.dylib" ]
       public_deps += [ "//build/config/sanitizers:copy_asan_runtime" ]
     }
   }
 
   bundle_data("chrome_framework_resources") {
     sources = [
+      "$root_out_dir/app_mode_loader.app",
+
       # This image is used to badge the lock icon in the
       # authentication dialogs, such as those used for installation
       # from disk image and Keystone promotion (if so enabled).  It
       # needs to exist as a file on disk and not just something in a
       # resource bundle because that's the interface that
       # Authorization Services uses.  Also, Authorization Services
       # can't deal with .icns files.
-      "$root_gen_dir/repack/resources.pak",
-      "$root_out_dir/app_mode_loader.app",
-      "$root_out_dir/chrome_100_percent.pak",
       "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_hidpi) {
-      sources += [ "$root_out_dir/chrome_200_percent.pak" ]
-    }
-
     if (enable_mac_keystone) {
       sources += [
         "browser/mac/keystone_promote_postflight.sh",
         "browser/mac/keystone_promote_preflight.sh",
       ]
     }
 
     if (icu_use_data_file) {
       sources += [ "$root_out_dir/icudtl.dat" ]
       public_deps += [ "//third_party/icu:icudata" ]
@@ skipping 228 matching lines @@
       "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id",
       "CHROMIUM_SHORT_NAME=$chrome_product_short_name",
     ]
 
     public_deps = [
       ":chrome_dll",
     ]
 
     deps = [
       ":chrome_framework_helpers",
-      ":chrome_framework_locales",
       ":chrome_framework_plugins",
       ":chrome_framework_resources",
+      ":repack_locales_pack",
       ":widevine_cdm_library",
       "//build/config/sanitizers:deps",
       "//chrome/app/nibs:chrome_xibs",
     ]
 
     if (is_chrome_branded) {
       deps += [ ":default_apps" ]
     }
 
     ldflags = [
@@ skipping 413 matching lines @@
     ]
     deps += [ "//extensions:extensions_resources" ]
   }
 
   if (is_mac) {
     output = "$root_gen_dir/repack/resources.pak"
   } else {
     output = "$root_out_dir/resources.pak"
   }
 
+  copy_data_to_bundle = is_mac
   if (enable_resource_whitelist_generation) {
     repack_whitelist = android_resource_whitelist
     deps += [ ":resource_whitelist" ]
   }
 }
 
 # GYP version: chrome/chrome_resources.gyp:browser_tests_pak
 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",
   ]
 }
 
 # Collects per-locale grit files from many sources into global per-locale files.
 chrome_repack_locales("repack_locales_pack") {
   visibility = [ ":*" ]
 
   input_locales = locales
+  copy_data_to_bundle = is_mac
 
   if (is_mac) {
     output_locales = locales_as_mac_outputs
   } else {
     output_locales = locales
   }
 
   if (enable_resource_whitelist_generation) {
     repack_whitelist = android_resource_whitelist
     deps = [
@@ skipping 82 matching lines @@
     if (enable_extensions) {
       sources += [ "$root_gen_dir/extensions/extensions_browser_resources_${percent}_percent.pak" ]
       deps += [ "//extensions:extensions_browser_resources" ]
     }
     if (enable_app_list) {
       sources += [ "$root_gen_dir/ui/app_list/resources/app_list_resources_${percent}_percent.pak" ]
       deps += [ "//ui/app_list/resources" ]
     }
 
     output = repack_output_file
+    copy_data_to_bundle = is_mac
 
     if (enable_resource_whitelist_generation) {
       repack_whitelist = android_resource_whitelist
       deps += [ ":resource_whitelist" ]
     }
   }
 
   copy(copy_name) {
     visibility = [ ":*" ]
     deps = [
@@ skipping 209 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}}",
     ]
   }
 }