Merge "Put min-sdk guard on 'this' liveness bug workaround."
diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index d83ad75..65d1e3a 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -582,9 +582,7 @@
//
// See b/116683601 and b/116837585.
public boolean canHaveThisJitCodeDebuggingBug() {
- // TODO(b/116841249): Make this an actual min-sdk guard once we know that Art no longer crashes
- // on these accesses.
- return true;
+ return minApiLevel < AndroidApiLevel.Q.getLevel();
}
// The dalvik jit had a bug where the long operations add, sub, or, xor and and would write