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

Merge "Add additional_certificates to android_app_import." am: 05ebca4f7f am: 6ea8f69bc5 am: f10cb18a20

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622565

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba08d54ace799cb2a6dba7cc5983234fcee5f33f
This commit is contained in:
Jaewoong Jung
2021-03-09 16:27:01 +00:00
committed by Automerger Merge Worker
parent 9c7ea28d06 f10cb18a20
commit f75649f692
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
java/app_import_test.go
View File

@@ -109,16 +109,30 @@ func TestAndroidAppImport_SigningLineage(t *testing.T) {
name: "foo",
apk: "prebuilts/apk/app.apk",
certificate: "platform",
additional_certificates: [":additional_certificate"],
lineage: "lineage.bin",
}
android_app_certificate {
name: "additional_certificate",
certificate: "cert/additional_cert",
}
`)
variant := ctx.ModuleForTests("foo", "android_common")
// Check cert signing lineage flag.
signedApk := variant.Output("signed/foo.apk")
// Check certificates
certificatesFlag := signedApk.Args["certificates"]
expected := "build/make/target/product/security/platform.x509.pem " +
"build/make/target/product/security/platform.pk8 " +
"cert/additional_cert.x509.pem cert/additional_cert.pk8"
if expected != certificatesFlag {
t.Errorf("Incorrect certificates flags, expected: %q, got: %q", expected, certificatesFlag)
}
// Check cert signing lineage flag.
signingFlag := signedApk.Args["flags"]
expected := "--lineage lineage.bin"
expected = "--lineage lineage.bin"
if expected != signingFlag {
t.Errorf("Incorrect signing flags, expected: %q, got: %q", expected, signingFlag)
}