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

Unified Diff: chrome/android/BUILD.gn

Issue 2369683002: Revert of Move language pak files to assets. (Closed)
Patch Set: 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
Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index e831c7a640f8502ee8a47bc9ab89293dc8f86d84..d8c675b97e3c8ccc25d5b2aa5abb26d1798f4eb8 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -66,7 +66,7 @@
]
}
-locale_pak_assets("chrome_locale_pak") {
+locale_pak_resources("chrome_locale_paks") {
sources = [
"$root_out_dir/locales/am.pak",
"$root_out_dir/locales/ar.pak",
@@ -125,6 +125,7 @@
"//chrome/android/java/res_chromium",
]
deps = [
+ ":chrome_locale_paks",
":chrome_strings_grd",
"//chrome/app:java_strings_grd",
"//components/policy:app_restrictions_resources",
@@ -262,11 +263,7 @@
# From java_sources.gni.
java_files = chrome_java_sources
- # Allow downstream targets to specify their own locale pak files.
- jar_excluded_patterns += [ "*/LocalePakFiles.class" ]
-
srcjar_deps += [
- ":chrome_locale_pak_srcjar",
"//chrome:page_info_connection_type_javagen",
"//chrome:website_settings_action_javagen",
"//components/browsing_data/core:browsing_data_utils_java",
@@ -675,10 +672,9 @@
forward_variables_from(invoker, "*")
native_lib_version_rule = "//build/util:chrome_version_json"
- srcjar_deps = [ ":chrome_locale_pak_srcjar" ]
+
deps += [
":chrome_java",
- ":chrome_locale_pak_assets",
":chrome_public_apk_assets",
":chrome_public_apk_resources",
"//base:base_java",
« no previous file with comments | « build/config/android/rules.gni ('k') | chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698