build: move to smali fork by Google

This commit is contained in:
oSumAtrIX 2023-08-11 01:58:18 +02:00
parent 81179c6430
commit ac410e52eb
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
12 changed files with 37 additions and 35 deletions

View File

@ -28,10 +28,12 @@ targetCompatibility = JavaVersion.VERSION_1_8
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { dependencies {
api 'org.smali:dexlib2:' + dexlib2Version api 'com.android.tools.smali:smali-dexlib2:' + dexlib2Version
api 'com.google.guava:guava:32.1.2-jre'
} }
apply from: 'configure-artifacts.gradle' apply from: 'configure-artifacts.gradle'

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -15,8 +15,8 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.jf.dexlib2.iface.DexFile; import com.android.tools.smali.dexlib2.iface.DexFile;
import org.jf.dexlib2.iface.MultiDexContainer; import com.android.tools.smali.dexlib2.iface.MultiDexContainer;
public abstract class AbstractMultiDexContainer<T extends DexFile> implements MultiDexContainer<T> { public abstract class AbstractMultiDexContainer<T extends DexFile> implements MultiDexContainer<T> {

View File

@ -10,9 +10,9 @@
package lanchon.multidexlib2; package lanchon.multidexlib2;
import org.jf.dexlib2.iface.DexFile; import com.android.tools.smali.dexlib2.iface.DexFile;
import org.jf.dexlib2.iface.MultiDexContainer; import com.android.tools.smali.dexlib2.iface.MultiDexContainer;
import org.jf.dexlib2.iface.MultiDexContainer.DexEntry; import com.android.tools.smali.dexlib2.iface.MultiDexContainer.DexEntry;
public class BasicDexEntry<C extends MultiDexContainer< /* ? extends */ D>, D extends DexFile> public class BasicDexEntry<C extends MultiDexContainer< /* ? extends */ D>, D extends DexFile>
implements DexEntry<D> { implements DexEntry<D> {

View File

@ -26,13 +26,13 @@ import java.util.concurrent.Future;
import com.google.common.collect.Iterators; import com.google.common.collect.Iterators;
import com.google.common.collect.PeekingIterator; import com.google.common.collect.PeekingIterator;
import org.jf.dexlib2.Opcodes; import com.android.tools.smali.dexlib2.Opcodes;
import org.jf.dexlib2.iface.ClassDef; import com.android.tools.smali.dexlib2.iface.ClassDef;
import org.jf.dexlib2.iface.DexFile; import com.android.tools.smali.dexlib2.iface.DexFile;
import org.jf.dexlib2.writer.DexWriter; import com.android.tools.smali.dexlib2.writer.DexWriter;
import org.jf.dexlib2.writer.io.DexDataStore; import com.android.tools.smali.dexlib2.writer.io.DexDataStore;
import org.jf.dexlib2.writer.io.FileDataStore; import com.android.tools.smali.dexlib2.writer.io.FileDataStore;
import org.jf.dexlib2.writer.pool.DexPool; import com.android.tools.smali.dexlib2.writer.pool.DexPool;
public class DexIO { public class DexIO {

View File

@ -15,8 +15,8 @@ import java.io.IOException;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import org.jf.dexlib2.Opcodes; import com.android.tools.smali.dexlib2.Opcodes;
import org.jf.dexlib2.dexbacked.DexBackedDexFile; import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile;
public class DirectoryDexContainer extends AbstractMultiDexContainer<DexBackedDexFile> { public class DirectoryDexContainer extends AbstractMultiDexContainer<DexBackedDexFile> {

View File

@ -16,10 +16,10 @@ import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import org.jf.dexlib2.Opcodes; import com.android.tools.smali.dexlib2.Opcodes;
import org.jf.dexlib2.iface.ClassDef; import com.android.tools.smali.dexlib2.iface.ClassDef;
import org.jf.dexlib2.iface.DexFile; import com.android.tools.smali.dexlib2.iface.DexFile;
import org.jf.dexlib2.iface.MultiDexContainer; import com.android.tools.smali.dexlib2.iface.MultiDexContainer;
public class MultiDexContainerBackedDexFile<T extends DexFile> implements DexFile { public class MultiDexContainerBackedDexFile<T extends DexFile> implements DexFile {

View File

@ -15,10 +15,10 @@ import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import org.jf.dexlib2.Opcodes; import com.android.tools.smali.dexlib2.Opcodes;
import org.jf.dexlib2.dexbacked.DexBackedDexFile; import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile;
import org.jf.dexlib2.iface.DexFile; import com.android.tools.smali.dexlib2.iface.DexFile;
import org.jf.dexlib2.iface.MultiDexContainer; import com.android.tools.smali.dexlib2.iface.MultiDexContainer;
public class MultiDexIO { public class MultiDexIO {

View File

@ -10,8 +10,8 @@
package lanchon.multidexlib2; package lanchon.multidexlib2;
import org.jf.dexlib2.Opcodes; import com.android.tools.smali.dexlib2.Opcodes;
import org.jf.dexlib2.VersionMap; import com.android.tools.smali.dexlib2.VersionMap;
public class OpcodeUtils { public class OpcodeUtils {

View File

@ -16,12 +16,12 @@ import java.io.InputStream;
import com.google.common.io.ByteStreamsHack; import com.google.common.io.ByteStreamsHack;
import com.google.common.io.Files; import com.google.common.io.Files;
import org.jf.dexlib2.Opcodes; import com.android.tools.smali.dexlib2.Opcodes;
import org.jf.dexlib2.dexbacked.DexBackedDexFile; import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile;
import org.jf.dexlib2.iface.DexFile; import com.android.tools.smali.dexlib2.iface.DexFile;
import org.jf.dexlib2.util.DexUtil; import com.android.tools.smali.dexlib2.util.DexUtil;
import org.jf.dexlib2.writer.io.DexDataStore; import com.android.tools.smali.dexlib2.writer.io.DexDataStore;
import org.jf.dexlib2.writer.io.FileDataStore; import com.android.tools.smali.dexlib2.writer.io.FileDataStore;
public class RawDexIO { public class RawDexIO {

View File

@ -13,7 +13,7 @@ package lanchon.multidexlib2;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;
import org.jf.dexlib2.iface.DexFile; import com.android.tools.smali.dexlib2.iface.DexFile;
public class SingletonDexContainer<T extends DexFile> extends AbstractMultiDexContainer<T> { public class SingletonDexContainer<T extends DexFile> extends AbstractMultiDexContainer<T> {

View File

@ -19,8 +19,8 @@ import java.util.TreeMap;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
import org.jf.dexlib2.Opcodes; import com.android.tools.smali.dexlib2.Opcodes;
import org.jf.dexlib2.dexbacked.DexBackedDexFile; import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile;
public class ZipFileDexContainer extends AbstractMultiDexContainer<DexBackedDexFile> { public class ZipFileDexContainer extends AbstractMultiDexContainer<DexBackedDexFile> {