diff options
| author | David Srbecky <dsrbecky@google.com> | 2023-12-10 22:44:05 +0000 |
|---|---|---|
| committer | David Srbecky <dsrbecky@google.com> | 2023-12-11 16:14:17 +0000 |
| commit | 45e960fb2b51660ecf47f672c9dce7f37d0c216b (patch) | |
| tree | 7a6ad5a16743fa43c92fa5c21c3ab812148e0f69 | |
| parent | f4d314133da7ab71732d4dca2907d5cc4f1899f0 (diff) | |
| download | common-45e960fb2b51660ecf47f672c9dce7f37d0c216b.tar.gz | |
Revert^2 "Switch to 'external/google-smali'"
f4d314133da7ab71732d4dca2907d5cc4f1899f0
Merged-In: I3434afa4bbdb1ceb4a21a98d004cda893a3e4528
Change-Id: I58a954e74e5e980224c300d4d58e536f345dcc10
| -rw-r--r-- | java/com/android/modules/targetprep/ClasspathFetcher.java | 2 | ||||
| -rw-r--r-- | javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/modules/targetprep/ClasspathFetcher.java b/java/com/android/modules/targetprep/ClasspathFetcher.java index 78383432..f7796716 100644 --- a/java/com/android/modules/targetprep/ClasspathFetcher.java +++ b/java/com/android/modules/targetprep/ClasspathFetcher.java @@ -46,7 +46,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Objects; -import org.jf.dexlib2.iface.ClassDef; +import com.android.tools.smali.dexlib2.iface.ClassDef; /* * Target preparer that fetches classpath relevant artifacts for a test in a 'reentrant' manner. diff --git a/javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java b/javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java index f10cc526..b974c148 100644 --- a/javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java +++ b/javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java @@ -28,6 +28,7 @@ import com.android.modules.proto.ClasspathClasses.ClasspathEntry; import com.android.modules.proto.ClasspathClasses.Jar; import com.android.modules.targetprep.ClasspathFetcher; import com.android.modules.utils.build.testing.DeviceSdkLevel; +import com.android.tools.smali.dexlib2.iface.ClassDef; import com.android.tradefed.config.Option; import com.android.tradefed.device.DeviceNotAvailableException; import com.android.tradefed.device.ITestDevice; @@ -47,7 +48,6 @@ import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; -import org.jf.dexlib2.iface.ClassDef; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; |