LineageOS/android_packages_modules_common
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert^2 "Switch to 'external/google-smali'"

Browse Source 
f4d314133d
(cherry picked from https://android-review.googlesource.com/q/commit:45e960fb2b51660ecf47f672c9dce7f37d0c216b)
Merged-In: I58a954e74e5e980224c300d4d58e536f345dcc10
Change-Id: I58a954e74e5e980224c300d4d58e536f345dcc10
This commit is contained in:
David Srbecky
2023-12-10 22:44:05 +00:00
committed by Cherrypicker Worker
parent 425c48f7a8
commit fe0fb066ce
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/android/modules/targetprep/ClasspathFetcher.java
View File

@@ -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.

2
javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java
View File

@@ -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;