Merge branch '2990-a14-blueprint' into 'a14' (6972503f) · Commits · e / os / android_build_soong

java/app.go

+15 −3

Original line number	Diff line number	Diff line
		@@ -667,10 +667,22 @@ 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"),
		}
		}
		} else {
		pem, key := ctx.Config().DefaultAppCertificate(ctx)
		mainCert = Certificate{