Make apex.key and certificate overridable.

Test: apex_test.go Fixes: 185477325 Change-Id: I8992ac5606fa92f53f07e6870a034f2d3352e618
2021-04-20 16:21:24 -07:00
parent 731bb91b8e
commit 4cfdf7de26
3 changed files with 44 additions and 27 deletions
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -872,7 +872,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)
 	}