Merge branch 'main' of https://github.com/REAndroid/ARSCLib into main

This commit is contained in:
REAndroid 2023-03-27 13:52:07 -04:00
commit ffc53645ee

View File

@ -623,6 +623,7 @@ public class ApkModule implements ApkFile {
} }
} }
private void mergeDexFiles(ApkModule module){ private void mergeDexFiles(ApkModule module){
UncompressedFiles uncompressedFiles=module.getUncompressedFiles();
List<DexFileInputSource> existList=listDexFiles(); List<DexFileInputSource> existList=listDexFiles();
List<DexFileInputSource> comingList=module.listDexFiles(); List<DexFileInputSource> comingList=module.listDexFiles();
APKArchive archive=getApkArchive(); APKArchive archive=getApkArchive();
@ -636,6 +637,7 @@ public class ApkModule implements ApkFile {
} }
} }
for(DexFileInputSource source:comingList){ for(DexFileInputSource source:comingList){
uncompressedFiles.removePath(source.getAlias());
String name= DexFileInputSource.getDexName(index); String name= DexFileInputSource.getDexName(index);
DexFileInputSource add=new DexFileInputSource(name, source.getInputSource()); DexFileInputSource add=new DexFileInputSource(name, source.getInputSource());
archive.add(add); archive.add(add);