commit 2355167ef791c294ade730053d047e719e1107df
author Gilbert Cabillic <gcabillic@google.com> Mon Mar 06 11:15:15 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 06 11:15:16 2017 +0000
tree cc718c99bd48c6abe3d2ffbebc9cf15fc3206eb9
parent 24a97a134f940b29bb58a042ed16adee5cccbbfd
parent 973be20162a7b56a51e3aad338ac5c3dcd91683e

Merge "Update Dx used by Jack" into ub-jack

dx-ref/README.txt

diff --git a/dx-ref/README.txt b/dx-ref/README.txt
index da96e9d..da6a618 100644
--- a/dx-ref/README.txt
+++ b/dx-ref/README.txt
@@ -1,9 +1,12 @@
 latest commit in aosp-master for dalvik project:
 
-commit e2808cf44a08f7e39163f79c9483c17602f58266
-Merge: c954851 bb404aa
-Author: Benoit Lamarche <benoitlamarche@google.com>
-Date:   Fri Dec 19 09:46:22 2014 +0000
+commit e8f93df54678f116bf5e026691ae7f8fbe7dc991
+Merge: b912f8069 efc750bed
+Author: Orion Hodson <oth@google.com>
+Date:   Thu Mar 2 14:16:41 2017 +0000
 
-    Merge "Do not keep the DexFile field in Main between runs"
+    Merge "Update dx tests and test runner scripts" am: 105c25c441 am: 36852bfcc2
+    am: efc750bed6
+
+    Change-Id: Ia85e5381e00bbd11bdc8aff3cf3fcda5e67c8640
 

dx-ref/dx.jar

diff --git a/dx-ref/dx.jar b/dx-ref/dx.jar
index 5039f30..15da6be 100644
--- a/dx-ref/dx.jar
+++ b/dx-ref/dx.jar
Binary files differ

jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java

diff --git a/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java
index 8ccd601..6dba161 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java
@@ -490,7 +490,8 @@
       commandLine.add("--no-optimize");
     }
 
-    // commandLine.add("--core-library");
+    commandLine.add("--min-sdk-version");
+    commandLine.add(minApiLevel);
 
     if (isVerbose) {
       commandLine.add("--verbose");