commit ef163b0c078f1d99a5f29fec75353b2288d800f8
author Ben Gruver <bgruv@google.com> Fri Apr 28 16:16:46 2017 -0700
committer Ben Gruver <bgruv@google.com> Fri Apr 28 16:16:46 2017 -0700
tree ab86a820a5b725c1f9f927456091ff53626a366f
parent 6183fca7d577d94432d513ae7210df3ff792a0be

Fixes for dexlib2 changes introduced in v2.2.0

Test: make cts-api-coverage
Change-Id: Ibdb22bffd20f971e75082e341a08881479e3bf28

tools/cts-api-coverage/src/com/android/cts/apicoverage/CtsApiCoverage.java

diff --git a/tools/cts-api-coverage/src/com/android/cts/apicoverage/CtsApiCoverage.java b/tools/cts-api-coverage/src/com/android/cts/apicoverage/CtsApiCoverage.java
index 2b57c76..fb82c95 100644
--- a/tools/cts-api-coverage/src/com/android/cts/apicoverage/CtsApiCoverage.java
+++ b/tools/cts-api-coverage/src/com/android/cts/apicoverage/CtsApiCoverage.java
@@ -19,8 +19,7 @@
 import com.android.compatibility.common.util.CddTest;
 
 import org.jf.dexlib2.DexFileFactory;
-import org.jf.dexlib2.DexFileFactory.DexFileNotFound;
-import org.jf.dexlib2.DexFileFactory.MultipleDexFilesException;
+import org.jf.dexlib2.DexFileFactory.DexFileNotFoundException;
 import org.jf.dexlib2.Opcodes;
 import org.jf.dexlib2.iface.Annotation;
 import org.jf.dexlib2.iface.AnnotationElement;
@@ -264,9 +263,8 @@
 
         DexFile dexFile = null;
         try {
-            dexFile = DexFileFactory.loadDexFile(
-                testSource, null /*dexEntry*/, Opcodes.forApi(api));
-        } catch (IOException | DexFileFactory.DexFileNotFound e) {
+            dexFile = DexFileFactory.loadDexFile(testSource, Opcodes.forApi(api));
+        } catch (IOException | DexFileFactory.DexFileNotFoundException e) {
             System.err.println("Unable to load dex file: " + testSource.getPath());
             return;
         }