Merge "Add resources.pb to the apex bundle"

2018-11-23 07:55:35 +00:00
parent b781740240 1ed0fc532d
commit 41db7a81e5
1 changed files with 5 additions and 1 deletions
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -69,7 +69,11 @@ var (
 		})

 	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")