Add resources.pb to the apex bundle
The file was missing.
Bug: 117295826
Test: tapas com.android.runtime.debug; m dist
$ unzip -l com.android.runtime.debug-base.zip
Archive: com.android.runtime.debug-base.zip
Length Date Time Name
--------- ---------- ----- ----
29614080 1980-01-01 09:00 apex/armeabi-v7a.img
52 1980-01-01 09:00 root/manifest.json
379 1980-01-01 09:00 manifest/AndroidManifest.xml
59 1980-01-01 09:00 resources.pb
--------- -------
29614570 4 files
Change-Id: I916ad5ba479c952a106b055c0e71e7e6556b6101
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")