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

Unified Diff: chrome/android/BUILD.gn

Issue 2894763002: Revert of Separate WebView's locale paks from Chrome's locale paks (Closed)
Patch Set: Created 3 years, 7 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 | « android_webview/BUILD.gn ('k') | chrome/browser/chrome_browser_main_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 343263bdd2a91507fbc0595361cb29638a8c3d34..1a2527ee1387309919945f0f10c4abcce9802b67 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//android_webview/webview_repack_locales_list.gni")
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
import("//build/util/process_version.gni")
@@ -599,6 +600,9 @@
deps = [
":chrome_public_locale_pak_assets",
"//chrome:packed_resources",
+ "//chrome/android/webapk/libs/runtime_library:runtime_library_assets",
+ "//third_party/icu:icu_assets",
+ "//v8:v8_external_startup_data_assets",
]
}
@@ -688,7 +692,6 @@
}
}
- # This target does not output locale paks.
chrome_paks("monochrome_paks") {
output_dir = "$target_gen_dir/$target_name"
@@ -697,7 +700,8 @@
"//android_webview:generate_aw_resources",
]
- exclude_locale_paks = true
+ additional_locale_source_patterns = webview_repack_locales_source_patterns
+ deps += webview_repack_locales_deps
if (enable_resource_whitelist_generation) {
repack_whitelist = monochrome_resource_whitelist
@@ -705,18 +709,18 @@
}
}
- # This target explicitly includes locale paks via deps.
android_assets("monochrome_pak_assets") {
sources = [
"$target_gen_dir/monochrome_paks/chrome_100_percent.pak",
"$target_gen_dir/monochrome_paks/resources.pak",
]
+ foreach(_locale, locales) {
+ sources += [ "$target_gen_dir/monochrome_paks/locales/$_locale.pak" ]
+ }
disable_compression = true
deps = [
- ":chrome_public_locale_pak_assets",
":monochrome_paks",
- "//android_webview:locale_pak_assets",
]
}
} # current_toolchain == host_toolchain
« no previous file with comments | « android_webview/BUILD.gn ('k') | chrome/browser/chrome_browser_main_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698