Replace dx module with artifact dependency

YasserYan · Dec 1, 2016 · 929194f · 929194f
1 parent 5a8a842
commit 929194f
Show file tree

Hide file tree

Showing 272 changed files with 8 additions and 57,628 deletions.
diff --git a/dexmaker/build.gradle b/dexmaker/build.gradle
@@ -8,7 +8,7 @@ repositories {
 }
 
 dependencies {
-    compile project(":dx")
+    compile 'com.jakewharton.android.repackaged:dalvik-dx:7.1.0_r7'
 
     testCompile 'junit:junit:4.12'
 }
diff --git a/dexmaker/src/main/java/com/android/dx/DexMaker.java b/dexmaker/src/main/java/com/android/dx/DexMaker.java
@@ -16,7 +16,7 @@
 
 package com.android.dx;
 
-import com.android.dx.dex.DexFormat;
+import com.android.dex.DexFormat;
 import com.android.dx.dex.DexOptions;
 import com.android.dx.dex.code.DalvCode;
 import com.android.dx.dex.code.PositionList;
@@ -26,20 +26,17 @@
 import com.android.dx.dex.file.EncodedField;
 import com.android.dx.dex.file.EncodedMethod;
 import com.android.dx.rop.code.AccessFlags;
-import static com.android.dx.rop.code.AccessFlags.ACC_CONSTRUCTOR;
 import com.android.dx.rop.code.LocalVariableInfo;
 import com.android.dx.rop.code.RopMethod;
 import com.android.dx.rop.cst.CstString;
 import com.android.dx.rop.cst.CstType;
 import com.android.dx.rop.type.StdTypeList;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Modifier;
-import static java.lang.reflect.Modifier.PRIVATE;
-import static java.lang.reflect.Modifier.STATIC;
-
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -48,6 +45,10 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
 
+import static com.android.dx.rop.code.AccessFlags.ACC_CONSTRUCTOR;
+import static java.lang.reflect.Modifier.PRIVATE;
+import static java.lang.reflect.Modifier.STATIC;
+
 /**
  * Generates a </i><strong>D</strong>alvik <strong>EX</strong>ecutable (dex)
  * file for execution on Android. Dex files define classes and interfaces,

diff --git a/dx/build.gradle b/dx/build.gradle
diff --git a/dx/src/main/java/com/android/dx/Version.java b/dx/src/main/java/com/android/dx/Version.java
diff --git a/dx/src/main/java/com/android/dx/cf/code/Merger.java b/dx/src/main/java/com/android/dx/cf/code/Merger.java
diff --git a/dx/src/main/java/com/android/dx/dex/DexFormat.java b/dx/src/main/java/com/android/dx/dex/DexFormat.java
diff --git a/dx/src/main/java/com/android/dx/dex/DexOptions.java b/dx/src/main/java/com/android/dx/dex/DexOptions.java