Skip to content

Commit

Permalink
Update Dalvik-dx to latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
TimvdLippe authored and drewhannay committed Dec 1, 2018
1 parent 4183a9a commit 1e417ef
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion dexmaker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ tasks.withType(JavaCompile) {
}

dependencies {
implementation 'com.jakewharton.android.repackaged:dalvik-dx:7.1.0_r7'
implementation 'com.jakewharton.android.repackaged:dalvik-dx:9.0.0_r3'
}
6 changes: 3 additions & 3 deletions dexmaker/src/main/java/com/android/dx/DexMaker.java
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ public void declare(FieldId<?, ?> fieldId, int flags, Object staticValue) {
public byte[] generate() {
if (outputDex == null) {
DexOptions options = new DexOptions();
options.targetApiLevel = DexFormat.API_NO_EXTENDED_OPCODES;
options.minSdkVersion = DexFormat.API_NO_EXTENDED_OPCODES;
outputDex = new DexFile(options);
}

Expand Down Expand Up @@ -541,7 +541,7 @@ public ClassLoader generateAndLoad(ClassLoader parent, File dexCache) throws IOE
DexFile getDexFile() {
if (outputDex == null) {
DexOptions options = new DexOptions();
options.targetApiLevel = DexFormat.API_NO_EXTENDED_OPCODES;
options.minSdkVersion = DexFormat.API_NO_EXTENDED_OPCODES;
outputDex = new DexFile(options);
}
return outputDex;
Expand Down Expand Up @@ -572,7 +572,7 @@ ClassDefItem toClassDefItem() {
}

DexOptions dexOptions = new DexOptions();
dexOptions.targetApiLevel = DexFormat.API_NO_EXTENDED_OPCODES;
dexOptions.minSdkVersion = DexFormat.API_NO_EXTENDED_OPCODES;

CstType thisType = type.constant;

Expand Down

0 comments on commit 1e417ef

Please sign in to comment.