Merge pull request #4 from Kirlif/storing_lib_files

Apply proper compression of NDK-generated libraries when merging.
This commit is contained in:
REAndroid 2022-12-27 15:05:49 -05:00 committed by GitHub
commit ca42414ba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -323,7 +323,7 @@ public class ApkModule {
APKArchive archiveComing = module.getApkArchive(); APKArchive archiveComing = module.getApkArchive();
Map<String, InputSource> comingAlias=ApkUtil.toAliasMap(archiveComing.listInputSources()); Map<String, InputSource> comingAlias=ApkUtil.toAliasMap(archiveComing.listInputSources());
Map<String, InputSource> existAlias=ApkUtil.toAliasMap(archiveExist.listInputSources()); Map<String, InputSource> existAlias=ApkUtil.toAliasMap(archiveExist.listInputSources());
UncompressedFiles uf=getUncompressedFiles(); UncompressedFiles uncompressedFiles = module.getUncompressedFiles();
for(InputSource inputSource:comingAlias.values()){ for(InputSource inputSource:comingAlias.values()){
if(existAlias.containsKey(inputSource.getAlias())||existAlias.containsKey(inputSource.getName())){ if(existAlias.containsKey(inputSource.getAlias())||existAlias.containsKey(inputSource.getName())){
continue; continue;
@ -331,9 +331,11 @@ public class ApkModule {
if(DexFileInputSource.isDexName(inputSource.getName())){ if(DexFileInputSource.isDexName(inputSource.getName())){
continue; continue;
} }
if (inputSource.getAlias().startsWith("lib/")){
uncompressedFiles.removePath(inputSource.getAlias());
}
logVerbose("Added: "+inputSource.getAlias()); logVerbose("Added: "+inputSource.getAlias());
archiveExist.add(inputSource); archiveExist.add(inputSource);
uf.addPath(inputSource);
} }
} }
private void mergeDexFiles(ApkModule module){ private void mergeDexFiles(ApkModule module){