From 096c4db896797c5ceb65ba5721b595ad4765ad91 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Sat, 23 Jun 2012 13:18:01 +0300 Subject: Run zipalign tool after android packges is created and signed. Change-Id: Idaeb93490723085b8f5f7cae356fbaee40636f89 Reviewed-by: Daniel Teske --- src/plugins/android/androidpackagecreationstep.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/plugins/android/androidpackagecreationstep.cpp') diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp index 1d4ba4c30e..4b8c008799 100644 --- a/src/plugins/android/androidpackagecreationstep.cpp +++ b/src/plugins/android/androidpackagecreationstep.cpp @@ -175,6 +175,7 @@ bool AndroidPackageCreationStep::init() m_keystorePathForRun = m_keystorePath; m_certificatePasswdForRun = m_certificatePasswd; m_jarSigner = AndroidConfigurations::instance().jarsignerPath(); + m_zipAligner = AndroidConfigurations::instance().zipalignPath(); initCheckRequiredLibrariesForRun(); return true; } @@ -425,7 +426,7 @@ bool AndroidPackageCreationStep::createPackage() << QLatin1String("-storepass") << m_keystorePasswd << m_apkPathUnsigned.toUserOutput() << m_certificateAlias; - buildProc->start(m_jarSigner.toString(), build); //TODO + buildProc->start(m_jarSigner.toString(), build); if (!buildProc->waitForStarted()) { disconnect(buildProc, 0, this, 0); buildProc->deleteLater(); @@ -442,7 +443,12 @@ bool AndroidPackageCreationStep::createPackage() emit addOutput(tr("Failed, try again"), ErrorMessageOutput); m_certificatePasswdForRun.clear(); } - if (QFile::rename(m_apkPathUnsigned.toString(), m_apkPathSigned.toString())) { + build.clear(); + build << QLatin1String("-f") << QLatin1String("-v") << QLatin1String("4") << m_apkPathUnsigned.toString() << m_apkPathSigned.toString(); + buildProc->start(m_zipAligner.toString(), build); + buildProc->waitForFinished(); + if (!buildProc->exitCode()) { + QFile::remove(m_apkPathUnsigned.toString()); emit addOutput(tr("Release signed package created to %1") .arg(m_apkPathSigned.toUserOutput()) , MessageOutput); -- cgit v1.2.1