Skip to content

Commit 26a35cf

Browse files
authored
Merge pull request #677 from rupesh-kumar-lpu/branchAABSigning
Update AndroidBuild.java for AAB Jar Signing(V1 Signature)
2 parents 67dcfab + 6ccd260 commit 26a35cf

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

mode/src/processing/mode/android/AndroidBuild.java

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -789,19 +789,27 @@ private File signPackage(File projectFolder, String keyStorePassword, String fil
789789
keyStore.getAbsolutePath(), keyStorePassword);
790790

791791
if (isAAB) {
792-
File signedPackageV2 = new File(projectFolder,
793-
path + sketch.getName().toLowerCase() + "_release_signed_v2." + fileExt);
794-
ApkSignerV2.signJarV2(signedPackageV1, signedPackageV2,
795-
AndroidKeyStore.ALIAS_STRING, keyStorePassword,
796-
keyStore.getAbsolutePath(), keyStorePassword);
797-
return signedPackageV2;
792+
return signedPackageV1;
798793
} else {
799-
File alignedPackage = zipalignPackage(signedPackageV1, projectFolder, fileExt);
794+
795+
// To Do: The following Currently showing "Error with package export" on V2 signed APK generation
796+
// So for now keeping it as it is and continuing with V1 signing on APKs
797+
798+
// File signedPackageV2 = new File(projectFolder,
799+
// path + sketch.getName().toLowerCase() + "_release_signed_v2." + fileExt);
800+
// ApkSignerV2.signJarV2(signedPackageV1, signedPackageV2,
801+
// AndroidKeyStore.ALIAS_STRING, keyStorePassword,
802+
// keyStore.getAbsolutePath(), keyStorePassword);
803+
// File alignedPackage = zipalignPackage(signedPackageV2, projectFolder, fileExt, "v2");
804+
805+
806+
File alignedPackage = zipalignPackage(signedPackageV1, projectFolder, fileExt, "v1");
807+
800808
return alignedPackage;
801809
}
802810
}
803811

804-
private File zipalignPackage(File signedPackage, File projectFolder, String fileExt)
812+
private File zipalignPackage(File signedPackage, File projectFolder, String fileExt, String signingType)
805813
throws IOException, InterruptedException {
806814
File zipAlign = sdk.getZipAlignTool();
807815
if (zipAlign == null || !zipAlign.exists()) {
@@ -811,7 +819,7 @@ private File zipalignPackage(File signedPackage, File projectFolder, String file
811819
}
812820

813821
File alignedPackage = new File(projectFolder,
814-
getPathToAPK() + sketch.getName().toLowerCase() + "_release_signed_aligned."+fileExt);
822+
getPathToAPK() + sketch.getName().toLowerCase() + "_release_signed_aligned"+signingType+"."+fileExt);
815823

816824
String[] args = {
817825
zipAlign.getAbsolutePath(), "-v", "-f", "4",

0 commit comments

Comments
 (0)