diff options
| author | David Srbecky <dsrbecky@google.com> | 2023-12-08 18:08:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-08 18:08:25 +0000 |
| commit | 244a1c292c63607d78e92c0c4474b0a8c55cd18d (patch) | |
| tree | c43ed67860e552891d21fe8a1eb069154c05024f | |
| parent | 936425676181da2286567e0440344d01dd1931ff (diff) | |
| parent | 0edac887884d3e17959d3db097c508609b6e9f17 (diff) | |
| download | common-tmp_amf_315507370.tar.gz | |
Merge "Switch to 'external/google-smali'" into main am: 0edac88788tmp_amf_315507370
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2863785
Change-Id: Ic0f904723209297ff57c78f249311fc55a6c815d
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 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; |