commit 98318494cb5b802c0c3a93fdaabb2239a5b13e9e
author Ulyana Trafimovich <skvadrik@google.com> Fri Aug 30 08:47:56 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 30 08:47:56 2019 -0700
tree 78e1c0c4baf33dd5c13f2de1c1a95541ca222dcf
parent a937690b71d863bd26bb5e797f9de908620727f4
parent ba6932af4c712f3e5b402e9801985754698ead0f

Merge "Bumped DEX format version to 040."
am: ba6932af4c

Change-Id: Iaeb61121f5854bbbc7f762e131be1c1c27d14331

dx/src/com/android/dex/DexFormat.java

diff --git a/dx/src/com/android/dex/DexFormat.java b/dx/src/com/android/dex/DexFormat.java
index 66b4460..ab99566 100644
--- a/dx/src/com/android/dex/DexFormat.java
+++ b/dx/src/com/android/dex/DexFormat.java
@@ -23,6 +23,9 @@
 public final class DexFormat {
     private DexFormat() {}
 
+    /** API level to target in order to allow spaces in SimpleName */
+    public static final int API_SPACES_IN_SIMPLE_NAME = 10000;
+
     /** API level to target in order to generate const-method-handle and const-method-type */
     public static final int API_CONST_METHOD_HANDLE = 28;
 
@@ -48,6 +51,9 @@
      */
     public static final int API_CURRENT = API_CONST_METHOD_HANDLE;
 
+    /** dex file version number for API level 10000 and earlier */
+    public static final String VERSION_FOR_API_10000 = "040";
+
     /** dex file version number for API level 28 and earlier */
     public static final String VERSION_FOR_API_28 = "039";
 
@@ -127,6 +133,8 @@
             return API_METHOD_HANDLES;
         } else if (version.equals(VERSION_FOR_API_28)) {
             return API_CONST_METHOD_HANDLE;
+        } else if (version.equals(VERSION_FOR_API_10000)) {
+            return API_SPACES_IN_SIMPLE_NAME;
         } else if (version.equals(VERSION_CURRENT)) {
             return API_CURRENT;
         }
@@ -145,6 +153,8 @@
 
         if (targetApiLevel >= API_CURRENT) {
             version = VERSION_CURRENT;
+        } else if (targetApiLevel >= API_SPACES_IN_SIMPLE_NAME) {
+            version = VERSION_FOR_API_10000;
         } else if (targetApiLevel >= API_CONST_METHOD_HANDLE) {
             version = VERSION_FOR_API_28;
         } else if (targetApiLevel >= API_METHOD_HANDLES) {

dx/tests/run-all-tests

diff --git a/dx/tests/run-all-tests b/dx/tests/run-all-tests
index 3734a98..1822b22 100755
--- a/dx/tests/run-all-tests
+++ b/dx/tests/run-all-tests
@@ -33,7 +33,7 @@
 progdir=`pwd`
 prog="${progdir}"/`basename "${prog}"`
 
-skip_tests=""
+skip_tests="127-merge-stress"
 
 # Command-line options
 sequential="no"