Skip to content

Commit

Permalink
feat(core): support 7zip compress when signing apk with v2SignSchema
Browse files Browse the repository at this point in the history 
fix shwenzhang#212
  • Loading branch information
@simpleton
simpleton committed Dec 2, 2017
1 parent 21cc0b2 commit 3a351ce
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 16 deletions.
41 changes: 26 additions & 15 deletions AndResGuard-core/src/main/java/com/tencent/mm/androlib/ResourceApkBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public class ResourceApkBuilder {
private File mSignedApk;
private File mSignedWith7ZipApk;

private File m7ZipApk;

private File mAlignedApk;
private File mAlignedWith7ZipApk;

Expand All @@ -57,7 +59,7 @@ public void buildApkWithV1sign(HashMap<String, Integer> compressData) throws IOE
insureFileNameV1();
generalUnsignApk(compressData);
signApkV1(mUnSignedApk , mSignedApk);
use7zApk(compressData);
use7zApk(compressData, mSignedApk, mSignedWith7ZipApk);
alignApks();
copyFinalApkV1();
}
Expand All @@ -76,12 +78,17 @@ private void copyFinalApkV1() throws IOException {
public void buildApkWithV2sign(HashMap<String, Integer> compressData) throws Exception {
insureFileNameV2();
generalUnsignApk(compressData);
if (use7zApk(compressData, mUnSignedApk, m7ZipApk)) {
alignApk(m7ZipApk, mAlignedApk);
} else {
alignApk(mUnSignedApk, mAlignedApk);
}

/*
* Caution: If you sign your app using APK Signature Scheme v2 and make further changes to the app,
* the app's signature is invalidated.
* For this reason, use tools such as zipalign before signing your app using APK Signature Scheme v2, not after.
*/
alignApk(mUnSignedApk, mAlignedApk);
signApkV2(mAlignedApk, mSignedApk);
copyFinalApkV2();
}
Expand All @@ -104,27 +111,30 @@ private void insureFileNameV1() {

private void insureFileNameV2() {
mUnSignedApk = new File(mOutDir.getAbsolutePath(), mApkName + "_unsigned.apk");
m7ZipApk = new File(mOutDir.getAbsolutePath(), mApkName + "_7zip.apk");
mAlignedApk = new File(mOutDir.getAbsolutePath(), mApkName + "_aligned_unsigned.apk");
mSignedApk = new File(mOutDir.getAbsolutePath(), mApkName + "_aligned_signed.apk");
mAlignedWith7ZipApk = new File(mOutDir.getAbsolutePath(), mApkName + "_7zip_aligned_signed.apk");
m7zipOutPutDir = new File(mOutDir.getAbsolutePath(), TypedValue.OUT_7ZIP_FILE_PATH);
}

private void use7zApk(HashMap<String, Integer> compressData) throws IOException, InterruptedException {
private boolean use7zApk(HashMap<String, Integer> compressData, File originalAPK, File outputAPK) throws IOException, InterruptedException {
if (!config.mUse7zip) {
return;
return false;
}
if (!config.mUseSignAPK) {
throw new IOException("if you want to use 7z, you must enable useSign in the config file first");
}
if (!mSignedApk.exists()) {
if (!originalAPK.exists()) {
throw new IOException(
String.format("can not found the signed apk file to 7z, if you want to use 7z, " +
"you must fill the sign data in the config file path=%s", mSignedApk.getAbsolutePath())
"you must fill the sign data in the config file path=%s", originalAPK.getAbsolutePath())
);
}
System.out.printf("use 7zip to repackage: %s, will cost much more time\n", mSignedWith7ZipApk.getName());
FileOperation.unZipAPk(mSignedApk.getAbsolutePath(), m7zipOutPutDir.getAbsolutePath());
System.out.printf("use 7zip to repackage: %s, will cost much more time\n", outputAPK.getName());
FileOperation.unZipAPk(originalAPK.getAbsolutePath(), m7zipOutPutDir.getAbsolutePath());
//首先一次性生成一个全部都是压缩的安装包
generalRaw7zip();
generalRaw7zip(outputAPK);

ArrayList<String> storedFiles = new ArrayList<>();
//对于不压缩的要update回去
Expand All @@ -139,12 +149,13 @@ private void use7zApk(HashMap<String, Integer> compressData) throws IOException,
}
}

addStoredFileIn7Zip(storedFiles);
if (!mSignedWith7ZipApk.exists()) {
addStoredFileIn7Zip(storedFiles, outputAPK);
if (!outputAPK.exists()) {
throw new IOException(String.format(
"[use7zApk]7z repackage signed apk fail,you must install 7z command line version first, linux: p7zip, window: 7za, path=%s",
mSignedWith7ZipApk.getAbsolutePath()));
}
return true;
}

private String getSignatureAlgorithm(String hash) throws Exception {
Expand Down Expand Up @@ -369,7 +380,7 @@ private void addNonSignatureFiles(List<File> collectFiles, File metaFolder) {
}
}

private void addStoredFileIn7Zip(ArrayList<String> storedFiles) throws IOException, InterruptedException {
private void addStoredFileIn7Zip(ArrayList<String> storedFiles, File outSevenZipAPK) throws IOException, InterruptedException {
System.out.printf("[addStoredFileIn7Zip]rewrite the stored file into the 7zip, file count:%d\n", storedFiles.size());
String storedParentName = mOutDir.getAbsolutePath() + File.separator + "storefiles" + File.separator;
String outputName = m7zipOutPutDir.getAbsolutePath() + File.separator;
Expand All @@ -379,7 +390,7 @@ private void addStoredFileIn7Zip(ArrayList<String> storedFiles) throws IOExcepti
storedParentName = storedParentName + File.separator + "*";
//极限压缩
String cmd = Utils.isPresent(config.m7zipPath) ? config.m7zipPath : TypedValue.COMMAND_7ZIP;
ProcessBuilder pb = new ProcessBuilder(cmd, "a", "-tzip", mSignedWith7ZipApk.getAbsolutePath(), storedParentName, "-mx0");
ProcessBuilder pb = new ProcessBuilder(cmd, "a", "-tzip", outSevenZipAPK.getAbsolutePath(), storedParentName, "-mx0");
Process pro = pb.start();

InputStreamReader ir = new InputStreamReader(pro.getInputStream());
Expand All @@ -391,12 +402,12 @@ private void addStoredFileIn7Zip(ArrayList<String> storedFiles) throws IOExcepti
pro.destroy();
}

private void generalRaw7zip() throws IOException, InterruptedException {
private void generalRaw7zip(File outSevenZipApk) throws IOException, InterruptedException {
String outPath = m7zipOutPutDir.getAbsoluteFile().getAbsolutePath();
String path = outPath + File.separator + "*";
//极限压缩
String cmd = Utils.isPresent(config.m7zipPath) ? config.m7zipPath : TypedValue.COMMAND_7ZIP;
ProcessBuilder pb = new ProcessBuilder(cmd, "a", "-tzip", mSignedWith7ZipApk.getAbsolutePath(), path, "-mx9");
ProcessBuilder pb = new ProcessBuilder(cmd, "a", "-tzip", outSevenZipApk.getAbsolutePath(), path, "-mx9");
Process pro = pb.start();

InputStreamReader ir = new InputStreamReader(pro.getInputStream());
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

ANDRESGUARD_VESSION=1.2.9
ANDRESGUARD_VESSION=1.2.10

0 comments on commit 3a351ce

Please sign in to comment.