Merge "Revert^2 "Switch to 'external/google-smali'"" into main am: 74605f8caa

Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2867794

Change-Id: I8e200aa4ef41441d968b30c5074665709ac8ac1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 8 insertions, 7 deletions

diff --git a/java/android/compat/testing/Android.bp b/java/android/compat/testing/Android.bp
index 5265d89..fe5c91e 100644
--- a/java/android/compat/testing/Android.bp
+++ b/java/android/compat/testing/Android.bp
@@ -31,7 +31,7 @@ java_test_helper_library {
         "compatibility-host-util",
     ],
     static_libs: [
-        "dexlib2-no-guava-no-cli",
+        "smali-dexlib2-no-guava",
         "modules-utils-build-testing",
     ],
 }
diff --git a/java/android/compat/testing/Classpaths.java b/java/android/compat/testing/Classpaths.java
index bbc2ab4..7d547b6 100644
--- a/java/android/compat/testing/Classpaths.java
+++ b/java/android/compat/testing/Classpaths.java
@@ -37,11 +37,11 @@ import com.android.tradefed.util.FileUtil;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 
-import org.jf.dexlib2.DexFileFactory;
-import org.jf.dexlib2.Opcodes;
-import org.jf.dexlib2.dexbacked.DexBackedDexFile;
-import org.jf.dexlib2.iface.ClassDef;
-import org.jf.dexlib2.iface.MultiDexContainer;
+import com.android.tools.smali.dexlib2.DexFileFactory;
+import com.android.tools.smali.dexlib2.Opcodes;
+import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile;
+import com.android.tools.smali.dexlib2.iface.ClassDef;
+import com.android.tools.smali.dexlib2.iface.MultiDexContainer;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -99,7 +99,8 @@ public final class Classpaths {
                 DexFileFactory.loadDexContainer(jar, Opcodes.getDefault());
         ImmutableSet.Builder<ClassDef> set = ImmutableSet.builder();
         for (String dexName : container.getDexEntryNames()) {
-            set.addAll(Objects.requireNonNull(container.getEntry(dexName)).getClasses());
+            DexBackedDexFile dexFile = container.getEntry(dexName).getDexFile();
+            set.addAll(Objects.requireNonNull(dexFile).getClasses());
         }
         return set.build();
     }