From 74321cffb64adbecb7dff11c273a8d86b70ad210 Mon Sep 17 00:00:00 2001
From: cushon <cushon@google.com>
Date: Mon, 13 Aug 2018 15:36:03 -0700
Subject: Don't disable preverification

to ensure output contains valid stack map tables.

context: https://github.com/bazelbuild/bazel/issues/5855
PiperOrigin-RevId: 208555048
---
 .../com/google/devtools/build/lib/rules/android/AndroidBinary.java     | 3 +--
 tools/android/minify_java8_legacy_libs.cfg                             | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
index 5d95ce9a50..2a488af1b7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -1693,8 +1693,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
             .add("-dontwarn")
             .add("-dontnote")
             .add("-dontoptimize")
-            .add("-dontobfuscate")
-            .add("-dontpreverify");
+            .add("-dontobfuscate");
 
     List<Artifact> specs = new ArrayList<>();
     specs.addAll(
diff --git a/tools/android/minify_java8_legacy_libs.cfg b/tools/android/minify_java8_legacy_libs.cfg
index 74aa802d77..819d0634a5 100644
--- a/tools/android/minify_java8_legacy_libs.cfg
+++ b/tools/android/minify_java8_legacy_libs.cfg
@@ -16,7 +16,6 @@
 # Shrink only
 -dontoptimize
 -dontobfuscate
--dontpreverify
 
 -dontskipnonpubliclibraryclasses
 
-- 
cgit v1.2.3