From 24eb1e8a7b9f44dada09b0cef1d8199f572a12b6 Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kde.org>
Date: Fri, 20 Sep 2013 09:20:01 +0300
Subject: [PATCH] Android: Fix OpenJDK 7 package sign.

Add "-digestalg SHA1 -sigalg MD5withRSA" to jarsign parameters as suggested by
https://code.google.com/p/android/issues/detail?id=19567

Change-Id: I0c809517d8cd3b1225b6a557f9f91227dbf42cf9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
 src/plugins/android/androidpackagecreationstep.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp
index 9016fc8813f..67f7ab10e1a 100644
--- a/src/plugins/android/androidpackagecreationstep.cpp
+++ b/src/plugins/android/androidpackagecreationstep.cpp
@@ -744,7 +744,9 @@ bool AndroidPackageCreationStep::createPackage()
 
             QByteArray keyPass = m_certificatePasswdForRun.toUtf8();
             build.clear();
-            build << QLatin1String("-verbose") << QLatin1String("-keystore") << m_keystorePathForRun.toUserOutput()
+            build << QLatin1String("-verbose") << QLatin1String("-digestalg") << QLatin1String("SHA1")
+                  << QLatin1String("-sigalg") << QLatin1String("MD5withRSA")
+                  << QLatin1String("-keystore") << m_keystorePathForRun.toUserOutput()
                   << QLatin1String("-storepass") << m_keystorePasswd
                   << m_apkPathUnsigned.toUserOutput()
                   << m_certificateAlias;