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

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

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « build/config/allocator.gni ('k') | build/config/android/rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index de29cce90a3bdb1bfd1e732c21da9aa356f7bbe9..d6711b827f0bf14ea6df01e66ce9ada30fc6c8d5 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -260,6 +260,7 @@ template("create_apk") {
_resource_packaged_apk_path = _base_apk_path + ".ap_"
_packaged_apk_path = _base_apk_path + ".unfinished.apk"
+ _shared_resources = defined(invoker.shared_resources) && invoker.shared_resources
_configuration_name = "Release"
@@ -295,6 +296,10 @@ template("create_apk") {
"--apk-path", rebase_path(_resource_packaged_apk_path, root_build_dir),
]
+
+ if (_shared_resources) {
+ args += ["--shared-resources"]
+ }
}
action("${target_name}__package") {
@@ -718,6 +723,11 @@ template("process_resources") {
args += ["--v14-verify-only"]
}
+ if (defined(invoker.shared_resources) &&
+ invoker.shared_resources) {
+ args += ["--shared-resources"]
+ }
+
if (defined(invoker.all_resources_zip_path)) {
all_resources_zip = invoker.all_resources_zip_path
outputs += [ all_resources_zip ]
« no previous file with comments | « build/config/allocator.gni ('k') | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698