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

Unified Diff: chrome/BUILD.gn

Issue 2334213002: Delete chrome_framework_locales in favour of copy_data_to_bundle=true (Closed)
Patch Set: speculative fix Created 4 years, 3 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
« no previous file with comments | « no previous file | tools/grit/repack.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/BUILD.gn
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 8d1cef7d8dd4a432febaded48e1c91ea20b8995c..4cadc65a1aa6dec9c932924709c53fac31bcedce 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -702,21 +702,6 @@ if (is_win) {
}
}
- 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",
@@ -739,6 +724,8 @@ if (is_win) {
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
@@ -746,9 +733,6 @@ if (is_win) {
# 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",
]
@@ -763,10 +747,6 @@ if (is_win) {
"//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",
@@ -1015,9 +995,9 @@ if (is_win) {
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",
@@ -1451,6 +1431,7 @@ repack("packed_extra_resources") {
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" ]
@@ -1475,6 +1456,7 @@ 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
@@ -1577,6 +1559,7 @@ template("chrome_repack_percent") {
}
output = repack_output_file
+ copy_data_to_bundle = is_mac
if (enable_resource_whitelist_generation) {
repack_whitelist = android_resource_whitelist
« no previous file with comments | « no previous file | tools/grit/repack.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698