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

Unified Diff: build/config/android/internal_rules.gni

Issue 2345143002: Move language pak files to assets. (Closed)
Patch Set: Move language pak files back to assets rather than res. 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: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 314adcd88156f4a3b96808b367b81f2e930dbd34..4019d41a776837b3bafe991a29e50fc7daa8d7ea 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -230,7 +230,7 @@ template("write_build_config") {
]
}
- if (is_android_assets) {
+ if (is_android_assets || is_apk) {
if (defined(invoker.asset_sources)) {
_rebased_asset_sources =
rebase_path(invoker.asset_sources, root_build_dir)
@@ -247,6 +247,13 @@ template("write_build_config") {
if (defined(invoker.disable_compression) && invoker.disable_compression) {
args += [ "--disable-asset-compression" ]
}
+ if (defined(invoker.is_locale_asset) && invoker.is_locale_asset) {
+ args += [ "--is-locale-asset" ]
+ }
+ if (defined(invoker.has_alternative_locale_asset) &&
+ invoker.has_alternative_locale_asset) {
+ args += [ "--has-alternative-locale-asset" ]
+ }
}
if (is_android_resources || is_apk) {
@@ -276,13 +283,6 @@ template("write_build_config") {
rebase_path(invoker.r_text, root_build_dir),
]
}
- if (defined(invoker.is_locale_resource) && invoker.is_locale_resource) {
- args += [ "--is-locale-resource" ]
- }
- if (defined(invoker.has_alternative_locale_resource) &&
- invoker.has_alternative_locale_resource) {
- args += [ "--has-alternative-locale-resource" ]
- }
}
if (is_android_resources && defined(invoker.resource_dirs)) {

Powered by Google App Engine
This is Rietveld 408576698