From c766a0677e4554d7f20bb72b7aeeb1ac4fb2f26e Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 26 Feb 2025 19:02:06 +0530 Subject: [PATCH] Browser: Sign with user-keys if its available --- java/app.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/java/app.go b/java/app.go index c08c0eb9ed..a05fed451f 100755 --- a/java/app.go +++ b/java/app.go @@ -667,9 +667,21 @@ func processMainCert(m android.ModuleBase, certPropValue string, certificates [] var mainCert Certificate if certPropValue != "" { defaultDir := ctx.Config().DefaultAppCertificateDir(ctx) - mainCert = Certificate{ - Pem: defaultDir.Join(ctx, certPropValue+".x509.pem"), - Key: defaultDir.Join(ctx, certPropValue+".pk8"), + + userKeyBasePath := "user-keys/" + certPropValue + userPemPath := android.ExistentPathForSource(ctx, userKeyBasePath+".x509.pem") + userKeyPath := android.ExistentPathForSource(ctx, userKeyBasePath+".pk8") + + if certPropValue == "platform" && userPemPath.Valid() && userKeyPath.Valid() { + mainCert = Certificate{ + Pem: userPemPath.Path(), + Key: userKeyPath.Path(), + } + } else { + mainCert = Certificate{ + Pem: defaultDir.Join(ctx, certPropValue+".x509.pem"), + Key: defaultDir.Join(ctx, certPropValue+".pk8"), + } } } else { pem, key := ctx.Config().DefaultAppCertificate(ctx) -- GitLab