From c558a112d76c065e310a513ed58034b2d7b37811 Mon Sep 17 00:00:00 2001
From: Wind <xiawanli2008@gmail.com>
Date: Sun, 23 Feb 2020 23:58:31 +0800
Subject: [PATCH] =?UTF-8?q?Android=E4=B8=8A=E7=9A=84keystore=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=9B=B4=E6=94=B9=E4=B8=BABKS-V1,=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xpatch/src/main/assets/android.keystore          | Bin 0 -> 2198 bytes
 .../wind/xpatch/task/BuildAndSignApkTask.java    |  11 ++++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 xpatch/src/main/assets/android.keystore

diff --git a/xpatch/src/main/assets/android.keystore b/xpatch/src/main/assets/android.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..879c1dcd0661294a08c01d2cec23e3f5d7ae3512
GIT binary patch
literal 2198
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

literal 0
HcmV?d00001

diff --git a/xpatch/src/main/java/com/storm/wind/xpatch/task/BuildAndSignApkTask.java b/xpatch/src/main/java/com/storm/wind/xpatch/task/BuildAndSignApkTask.java
index ce55b3b..82880af 100644
--- a/xpatch/src/main/java/com/storm/wind/xpatch/task/BuildAndSignApkTask.java
+++ b/xpatch/src/main/java/com/storm/wind/xpatch/task/BuildAndSignApkTask.java
@@ -38,7 +38,16 @@ public class BuildAndSignApkTask implements Runnable {
 
         File keyStoreFile = new File(keyStoreFilePath);
         // assets/keystore分隔符不能使用File.separator，否则在windows上抛出IOException !!!
-        FileUtils.copyFileFromJar("assets/keystore", keyStoreFilePath);
+        String keyStoreAssetPath;
+        if (isAndroid()) {
+            // BKS-V1 类型
+            keyStoreAssetPath = "assets/android.keystore";
+        } else {
+            // BKS 类型
+            keyStoreAssetPath = "assets/keystore";
+        }
+
+        FileUtils.copyFileFromJar(keyStoreAssetPath, keyStoreFilePath);
 
         boolean signResult = signApk(unsignedApkPath, keyStoreFilePath, signedApkPath);