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

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

Browse Source 
Revert submission 2862565-use-google-smali

Reason for revert: DroidMonitor: Potential culprit for Bug X - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. b/315495442
Reverted changes: /q/submissionid:2862565-use-google-smali

Change-Id: I9a162d8c0915943432b888474303c46a5954afca
This commit is contained in:
Liu Liu
2023-12-09 00:06:11 +00:00
committed by Gerrit Code Review
parent 5d64f9910c
commit f4d314133d
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.nio.file.Path;
import java.util.Objects; 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. * 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,7 +28,6 @@ import com.android.modules.proto.ClasspathClasses.ClasspathEntry;
import com.android.modules.proto.ClasspathClasses.Jar; import com.android.modules.proto.ClasspathClasses.Jar;
import com.android.modules.targetprep.ClasspathFetcher; import com.android.modules.targetprep.ClasspathFetcher;
import com.android.modules.utils.build.testing.DeviceSdkLevel; 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.config.Option;
import com.android.tradefed.device.DeviceNotAvailableException; import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.ITestDevice; 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.Multimap;
import com.google.common.collect.Multimaps; import com.google.common.collect.Multimaps;
import org.jf.dexlib2.iface.ClassDef;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;