commit 41db7a81e54263b50e0163bb34a96a3871c25d4e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Nov 23 07:55:35 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 23 07:55:35 2018 +0000
tree 7f01f9317add5c6b7d5b75c3b09183ae5099f4f2
parent b78174024060c477085b3145d55ef76ba173c37a
parent 1ed0fc532da81008143f1b7ae8f80d6e3eba10c4

Merge "Add resources.pb to the apex bundle"

apex/apex.go

diff --git a/apex/apex.go b/apex/apex.go
index aad7c65..c0dfdd8 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -69,7 +69,11 @@
 		})
 
 	apexBundleRule = pctx.StaticRule("apexBundleRule", blueprint.RuleParams{
-		Command:     `${zip2zip} -i $in -o $out image.img:apex/${abi}.img manifest.json:root/manifest.json AndroidManifest.xml:manifest/AndroidManifest.xml`,
+		Command: `${zip2zip} -i $in -o $out ` +
+			`image.img:apex/${abi}.img ` +
+			`manifest.json:root/manifest.json ` +
+			`AndroidManifest.xml:manifest/AndroidManifest.xml ` +
+			`resources.pb`,
 		CommandDeps: []string{"${zip2zip}"},
 		Description: "app bundle",
 	}, "abi")