commit c5a808c93882dd802d4a22ca26f3b5463b8eed89
author Ulya Trafimovich <skvadrik@google.com> Wed Aug 21 11:31:48 2019 +0100
committer Ulya Trafimovich <skvadrik@google.com> Thu Aug 29 14:23:46 2019 +0100
tree 78e1c0c4baf33dd5c13f2de1c1a95541ca222dcf
parent a9e6e81858f320fb075a079ba1f44368e873d7cd

Bumped DEX format version to 040.

Version bump is needed after allowing spaces in SimpleName. DX itself
does not do any serious name validation, so no changes needed there.

Disabled test 127-merge-stress as it is nondeterministic and hangs.

Bug: 137432016
Bug: 140176236
Test: ran dalvik/dx/tests/run-all-tests
Change-Id: I8e10c17e1f464372609ab9c73184c231a85507cf

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"