Index: build/config/android/rules.gni |
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni |
index 090f55700ca812a3d4c02daf497d0d76a60a739d..08ad0d193cbf40759f1cbef77cc6ab703862087d 100644 |
--- a/build/config/android/rules.gni |
+++ b/build/config/android/rules.gni |
@@ -1385,7 +1385,11 @@ template("android_apk") { |
_generated_proguard_config = "$base_path.resources.proguard.txt" |
process_resources_target = "${_template_name}__process_resources" |
process_resources(process_resources_target) { |
- forward_variables_from(invoker, [ "include_all_resources" ]) |
+ forward_variables_from(invoker, |
+ [ |
+ "include_all_resources", |
+ "shared_resources", |
+ ]) |
srcjar_path = "${target_gen_dir}/${target_name}.srcjar" |
r_text_path = "${target_gen_dir}/${target_name}_R.txt" |
android_manifest = _android_manifest |
@@ -1617,6 +1621,7 @@ template("android_apk") { |
"deps", |
"extensions_to_not_compress", |
"language_splits", |
+ "shared_resources", |
]) |
apk_path = _final_apk_path |
android_manifest = _android_manifest |
@@ -1630,7 +1635,7 @@ template("android_apk") { |
# Allow icu data, v8 snapshots, and pak files to be loaded directly from |
# the .apk. |
# Note: These are actually suffix matches, not necessarily extensions. |
- extensions_to_not_compress = ".dat,.bin,.pak" |
+ extensions_to_not_compress = ".dat,.bin,.pak,.lpak" |
agrieve
2015/11/17 03:05:26
The default for this value in GYP is .dat,.bin,.pa
michaelbai
2015/11/17 17:51:11
Done.
|
} |
version_code = _version_code |