Merge changes I78d4965c,I659f8c08,I81b18fbd,I76d28b8d,Iedf464cc, ...
* changes:
Run TreeShakingTest on the CF backend
Add OpenJDK 1.8 JRE to third_party
CF backend: Implement minification
CF backend: Fix optimizing If to Goto
Merge registerInstructionsReferences and registerCatchedTypes
Implement CfCode.registerInstructionsReferences()
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index bf46660..6a78145 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
// This field is accessed from release scripts using simple pattern matching.
// Therefore, changing this field could break our release scripts.
- public static final String LABEL = "v1.2.2-dev";
+ public static final String LABEL = "v1.2.3-dev";
private Version() {
}
diff --git a/src/test/java/com/android/tools/r8/debug/DebugTestBase.java b/src/test/java/com/android/tools/r8/debug/DebugTestBase.java
index cbfcca6..685e8f7 100644
--- a/src/test/java/com/android/tools/r8/debug/DebugTestBase.java
+++ b/src/test/java/com/android/tools/r8/debug/DebugTestBase.java
@@ -139,6 +139,9 @@
Assume.assumeTrue("Skipping test " + testName.getMethodName()
+ " because debug tests are not yet supported on Windows",
!ToolHelper.isWindows());
+ Assume.assumeTrue("Skipping test " + testName.getMethodName()
+ + " because debug tests are not yet supported on device",
+ ToolHelper.getDexVm().getKind() == ToolHelper.DexVm.Kind.HOST);
ClassNameMapper classNameMapper =
config.getProguardMap() == null
