upgraded the dexlib version, and fixed a severe bug in the dex loader…

…. When the multiple_dex option was not enabled, the code loaded the first dex file it could file inside the APK instead of classes.dex. This could lead to the wrong dex file being loaded. Secondly, it indexed all the dex files even when the option was disabled. If the apk contained some broken dex file, this failed the loader.

.classpath

@@ -19,7 +19,7 @@
 	<classpathentry kind="lib" path="libs/powermock-mockito-1.6.1-full.jar"/>
 	<classpathentry kind="lib" path="libs/jboss-common-core-2.5.0.Final.jar"/>
 	<classpathentry kind="lib" path="libs/asm-debug-all-5.1.jar"/>
-	<classpathentry kind="lib" path="libs/dexlib2-2.2b3-55c33ebb.jar"/>
-	<classpathentry kind="lib" path="libs/util-2.2b3-55c33ebb.jar"/>
+	<classpathentry kind="lib" path="libs/dexlib2-2.2b4-adb12356.jar"/>
+	<classpathentry kind="lib" path="libs/util-2.2b4-adb12356.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>

ant.settings.jenkins

@@ -4,8 +4,8 @@ xmlprinter.jar=libs/AXMLPrinter2.jar
 ## Location of Polyglot classes jar file to link Soot against
 polyglot.jar=libs/polyglot.jar
 
-dexlib2.jar=libs/dexlib2-2.2b3-55c33ebb.jar
-dexlib-utils.jar=libs/util-2.2b3-55c33ebb.jar
+dexlib2.jar=libs/dexlib2-2.2b4-adb12356.jar
+dexlib-utils.jar=libs/util-2.2b4-adb12356.jar
 
 slf4j-api.jar=libs/slf4j-api-1.7.5.jar
 slf4j-simple.jar=libs/slf4j-simple-1.7.5.jar

ant.settings.template

@@ -4,8 +4,8 @@ xmlprinter.jar=libs/AXMLPrinter2.jar
 ## Location of Polyglot classes jar file to link Soot against
 polyglot.jar=libs/polyglot.jar
 
-dexlib2.jar=libs/dexlib2-2.1.3-a5d82813.jar
-dexlib-utils.jar=libs/util-2.1.3-a5d82813.jar
+dexlib2.jar=libs/dexlib2-2.2b4-adb12356.jar
+dexlib-utils.jar=libs/util-2.2b4-adb12356.jar
 
 slf4j-api.jar=libs/slf4j-api-1.7.5.jar
 slf4j-simple.jar=libs/slf4j-simple-1.7.5.jar

src/soot/DexClassProvider.java

@@ -125,10 +125,9 @@ private void buildDexIndex(Map<String, File> index, List<String> classPath) {
 							for (Enumeration<? extends ZipEntry> entries = archive.entries(); entries.hasMoreElements();) {
 								ZipEntry entry = entries.nextElement();
 		    					String entryName = entry.getName();
-		    					if(entryName.endsWith(".dex")){
-		    						entryNames.add(entryName);
-		    						if(!Options.v().process_multiple_dex())
-		    							break;
+		    					if(entryName.endsWith(".dex")) {
+		    						if (Options.v().process_multiple_dex() || entryName.equals("classes.dex"))
+		    							entryNames.add(entryName);
 		    					}
 							}
 						}catch(Exception e){

src/soot/SourceLocator.java

@@ -242,7 +242,8 @@ private List<String> getClassesUnder(String aPath, String prefix) {
 					String entryName = entry.getName();
 					// We are dealing with an apk file
 					if (entryName.endsWith(".dex"))
-						classes.addAll(DexClassProvider.classesOfDex(new File(aPath), entryName));
+						if (Options.v().process_multiple_dex() || entryName.equals("classes.dex"))
+							classes.addAll(DexClassProvider.classesOfDex(new File(aPath), entryName));
 				}		
 			} catch (IOException e) {
 				throw new CompilationDeathException("Error reasing archive '" + aPath + "'",e);
@@ -294,7 +295,8 @@ else if(entryName.endsWith(".dex")){
 				if(Options.v().process_multiple_dex()){
 					for(String dexEntryName : dexEntryNames){
 						try {
-							classes.addAll(DexClassProvider.classesOfDex(file,dexEntryName));
+							classes.addAll(DexClassProvider.classesOfDex(
+									file,dexEntryName));
 						} catch (Throwable e) {} /* Ignore unreadable files */
 					}
 				}else{

src/soot/toDex/DexPrinter.java

@@ -156,7 +156,7 @@ public class DexPrinter {
 
 	public DexPrinter() {
 		int api = Scene.v().getAndroidAPIVersion();
-		dexFile = DexBuilder.makeDexBuilder(Opcodes.forApi(api));
+		dexFile = new DexBuilder(Opcodes.forApi(api));
 	}
 
 	private void printApk(String outputDir, File originalApk) throws IOException {