commit 213712231ef5bc3b25e6bead2a67ff374f587678
author Mathias Rav <mathiasr@google.com> Tue Mar 27 17:18:38 2018 +0200
committer Mathias Rav <mathiasr@google.com> Tue Mar 27 17:18:38 2018 +0200
tree 89c7f98b1f3916c756dac5fc3c9108f56a50beae
parent f7c4cf6c25812f43c976a45000387bd90b65aa63

Enable buildPreNJdwpTestsDex on Windows

This reverts 1b588cbb ("Disable buildPreNJdwpTestsDex on Windows",
2018-03-22).

DX has been updated in c9222174 ("Update dx to a version that support
class file v52.", 2018-03-22), so it should be possible to build the
tests and run MinificationTest.checkStructure() on Windows now.

Bug: 76135355
Change-Id: If8185edd12e22684cb864f50739b8a9e4d270146

build.gradle

diff --git a/build.gradle b/build.gradle
index 2d9e9b4..8237781 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1339,10 +1339,6 @@
 }
 
 task buildPreNJdwpTestsDex(type: Exec, dependsOn: "buildPreNJdwpTestsJar") {
-    onlyIf {
-        // TODO(b/76135355): Update dx.bat on Windows to something that can build this.
-        !OperatingSystem.current().isWindows()
-    }
     def inFile = buildPreNJdwpTestsJar.archivePath
     def outFile = new File(buildPreNJdwpTestsJar.destinationDir, buildPreNJdwpTestsJar.baseName + '-dex.jar')
     inputs.file inFile

src/test/java/com/android/tools/r8/debug/MinificationTest.java

diff --git a/src/test/java/com/android/tools/r8/debug/MinificationTest.java b/src/test/java/com/android/tools/r8/debug/MinificationTest.java
index 414fbc3..2f995db 100644
--- a/src/test/java/com/android/tools/r8/debug/MinificationTest.java
+++ b/src/test/java/com/android/tools/r8/debug/MinificationTest.java
@@ -185,11 +185,6 @@
       String innerClassName,
       MethodSignature innerMethod)
       throws Throwable {
-    if (ToolHelper.isWindows()) {
-      // TODO(b/76135355): Update dx.bat on Windows to something that can build
-      // jdwp-tests-preN-dex.jar.
-      return;
-    }
     Path proguardMap = config.getProguardMap();
     String mappingFile = proguardMap == null ? null : proguardMap.toString();
     DexInspector inspector = new DexInspector(config.getPaths(), mappingFile);