From 4c7771bbb128196277c8ca22f73bf32ba60c1e97 Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 7 Mar 2025 17:40:34 +0530 Subject: [PATCH] Revert "Browser: Sign with user-keys if its available" This reverts commit e3aaa522fb048cd4e809ba94c36d5cf0af15f16a. --- java/app.go | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/java/app.go b/java/app.go index 45570e878d..c9f931fcc4 100644 --- a/java/app.go +++ b/java/app.go @@ -755,21 +755,9 @@ func processMainCert(m android.ModuleBase, certPropValue string, certificates [] var mainCert Certificate if certPropValue != "" { defaultDir := ctx.Config().DefaultAppCertificateDir(ctx) - - 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"), - } + mainCert = Certificate{ + Pem: defaultDir.Join(ctx, certPropValue+".x509.pem"), + Key: defaultDir.Join(ctx, certPropValue+".pk8"), } } else { pem, key := ctx.Config().DefaultAppCertificate(ctx) -- GitLab