commit 00933abd6e690908ef2722525f5a7236a0d81cad
author Mads Ager <ager@google.com> Thu May 31 12:43:16 2018 +0200
committer Mads Ager <ager@google.com> Thu May 31 12:43:16 2018 +0200
tree fa42b6c9581f4d09643cb0d63602888b0ccb770c
parent a6df011a099f2c56bc6ae66975a0d019b94bc3b6

Fix parsing of positions dex options in CompatDexBuilder.

If positions are either 'throwing' or 'important' that should put D8
in release mode.

R=zerny@google.com

Bug: 80262475
Change-Id: Ia7dde5d63b0b718bbc8afb919d5e0d919770aa73

src/main/java/com/android/tools/r8/compatdexbuilder/CompatDexBuilder.java

diff --git a/src/main/java/com/android/tools/r8/compatdexbuilder/CompatDexBuilder.java b/src/main/java/com/android/tools/r8/compatdexbuilder/CompatDexBuilder.java
index 6599591..90b863c 100644
--- a/src/main/java/com/android/tools/r8/compatdexbuilder/CompatDexBuilder.java
+++ b/src/main/java/com/android/tools/r8/compatdexbuilder/CompatDexBuilder.java
@@ -77,7 +77,11 @@
 
     for (int i = 0; i < flags.size(); i++) {
       String flag = flags.get(i);
-      if (flag.startsWith("--positions")) {
+      if (flag.startsWith("--positions=")) {
+        String positionsValue = flag.substring("--positions=".length());
+        if (positionsValue.startsWith("throwing") || positionsValue.startsWith("important")) {
+          noLocals = true;
+        }
         continue;
       }
       if (flag.startsWith("--num-threads=")) {