StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove apex_pubkey from the bundle module

Browse Source 
It's not yet supported by bundletool and blocks other testing (see
attached bug).

This is a partial revert of
https://android-review.googlesource.com/c/platform/build/soong/+/1183459/

Test: out/dist/mainline_modules_arm64/com.android.tzdata-base.zip
Test: checked content doesn't have apex_pubkey
Bug: 146460014
Change-Id: I268caa9f9736ba1913145a1ce1065f6f5179a6db
This commit is contained in:
Nikita Ioffe
2019-12-18 17:31:47 +00:00
parent 572aeed6a4
commit 5c3869a7db
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apex/builder.go
View File

@@ -138,7 +138,6 @@ var (
Command: `${zip2zip} -i $in -o $out ` + Command: `${zip2zip} -i $in -o $out ` +
`apex_payload.img:apex/${abi}.img ` + `apex_payload.img:apex/${abi}.img ` +
`apex_manifest.json:root/apex_manifest.json ` + `apex_manifest.json:root/apex_manifest.json ` +
`apex_pubkey:root/apex_pubkey ` +
`apex_manifest.pb:root/apex_manifest.pb ` + `apex_manifest.pb:root/apex_manifest.pb ` +
`AndroidManifest.xml:manifest/AndroidManifest.xml ` + `AndroidManifest.xml:manifest/AndroidManifest.xml ` +
`assets/NOTICE.html.gz:assets/NOTICE.html.gz`, `assets/NOTICE.html.gz:assets/NOTICE.html.gz`,