diff options
| author | David Srbecky <dsrbecky@google.com> | 2023-12-10 22:44:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-10 22:44:05 +0000 |
| commit | f7486b464a7313d7e8f14dad5e4299088dcc18be (patch) | |
| tree | 9874a85da24f33e4a7a7a173dfb03cf377cb50f8 | |
| parent | f6ba13a412298b897113ea649b279c85df4fdd76 (diff) | |
| download | platform-compat-f7486b464a7313d7e8f14dad5e4299088dcc18be.tar.gz | |
Revert^2 "Switch to 'external/google-smali'"
f6ba13a412298b897113ea649b279c85df4fdd76
Change-Id: I133a336684c94df37c5050caf19c1a90754e9f67
| -rw-r--r-- | java/android/compat/testing/Android.bp | 2 | ||||
| -rw-r--r-- | java/android/compat/testing/Classpaths.java | 13 |
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(); } |