diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-11 22:41:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-11 22:41:15 +0000 |
| commit | 0719c0a8c847a8e891a8f01d4383a4da9fc41faf (patch) | |
| tree | fa79c50c3ffd7dbeb58a36490574ebe5cd327b94 | |
| parent | 0bfa94f51a7132013eb7b8ff17f5fafafbfa58b0 (diff) | |
| parent | 980a681dd3719531c5bada9679094d8fc73ae3e4 (diff) | |
| download | common-0719c0a8c847a8e891a8f01d4383a4da9fc41faf.tar.gz | |
Merge "Revert "Switch to 'external/google-smali'"" into main am: 2b66bee296 am: 980a681dd3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2865847
Change-Id: I98f72ac426302485ae8b12e7591dcabea17f3eab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 f7796716..78383432 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 com.android.tools.smali.dexlib2.iface.ClassDef; +import org.jf.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 b974c148..f10cc526 100644 --- a/javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java +++ b/javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java @@ -28,7 +28,6 @@ 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; @@ -48,6 +47,7 @@ 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; |