commit 18423788cb69744466a095d423f04f1ff821d694
author Dario Freni <dariofreni@google.com> Mon Mar 02 21:47:09 2020 +0000
committer Dario Freni <dariofreni@google.com> Mon Mar 02 22:31:01 2020 +0000
tree c503d56a22b4e06ea2e6c468ba2b6c0584fd1df3
parent af8998cba667ccdaa6901e26ce7e5d3ccd321cee

Pass apex_build_info to bundle base.zip file

Fix: 150077028
Test: manual inspection of com.android.wifi-base.zip
Change-Id: Id201a3410a46e0c88a77e6f88e5b85906c7a6c8b

apex/builder.go

diff --git a/apex/builder.go b/apex/builder.go
index 2701a36..0049c94 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -139,6 +139,7 @@
 	apexBundleRule = pctx.StaticRule("apexBundleRule", blueprint.RuleParams{
 		Command: `${zip2zip} -i $in -o $out.base ` +
 			`apex_payload.img:apex/${abi}.img ` +
+			`apex_build_info.pb:apex/${abi}.build_info.pb ` +
 			`apex_manifest.json:root/apex_manifest.json ` +
 			`apex_manifest.pb:root/apex_manifest.pb ` +
 			`AndroidManifest.xml:manifest/AndroidManifest.xml ` +