From d5fb782caa2ee594644b34b678112904355a0ce2 Mon Sep 17 00:00:00 2001 From: Kirlif Date: Tue, 27 Dec 2022 20:45:33 +0100 Subject: [PATCH] Apply proper compression of NDK-generated libraries when merging. --- src/main/java/com/reandroid/lib/apk/ApkModule.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/reandroid/lib/apk/ApkModule.java b/src/main/java/com/reandroid/lib/apk/ApkModule.java index cc8f56b..7fd6fdf 100644 --- a/src/main/java/com/reandroid/lib/apk/ApkModule.java +++ b/src/main/java/com/reandroid/lib/apk/ApkModule.java @@ -323,7 +323,7 @@ public class ApkModule { APKArchive archiveComing = module.getApkArchive(); Map comingAlias=ApkUtil.toAliasMap(archiveComing.listInputSources()); Map existAlias=ApkUtil.toAliasMap(archiveExist.listInputSources()); - UncompressedFiles uf=getUncompressedFiles(); + UncompressedFiles uncompressedFiles = module.getUncompressedFiles(); for(InputSource inputSource:comingAlias.values()){ if(existAlias.containsKey(inputSource.getAlias())||existAlias.containsKey(inputSource.getName())){ continue; @@ -331,9 +331,11 @@ public class ApkModule { if(DexFileInputSource.isDexName(inputSource.getName())){ continue; } + if (inputSource.getAlias().startsWith("lib/")){ + uncompressedFiles.removePath(inputSource.getAlias()); + } logVerbose("Added: "+inputSource.getAlias()); archiveExist.add(inputSource); - uf.addPath(inputSource); } } private void mergeDexFiles(ApkModule module){