Merge "Make apex.key and certificate overridable."

2021-04-22 15:37:22 +00:00
parent f9c6744e28 4cfdf7de26
commit 6a328ff8ac
3 changed files with 44 additions and 27 deletions
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -871,7 +871,7 @@ func (a *apexBundle) getCertificateAndPrivateKey(ctx android.PathContext) (pem,
 		return a.containerCertificateFile, a.containerPrivateKeyFile
 	}

-	cert := String(a.properties.Certificate)
+	cert := String(a.overridableProperties.Certificate)
 	if cert == "" {
 		return ctx.Config().DefaultAppCertificate(ctx)
 	}