| commit | 74321cffb64adbecb7dff11c273a8d86b70ad210 | [log] [tgz] |
|---|---|---|
| author | cushon <cushon@google.com> | Mon Aug 13 15:36:03 2018 -0700 |
| committer | Copybara-Service <copybara-piper@google.com> | Mon Aug 13 15:37:24 2018 -0700 |
| tree | fdeb8baaad8f02ddb90988410f38b00547424dd1 | |
| parent | bd7d89a82014a4e75c6a12f726449fd3745133a2 [diff] |
Don't disable preverification to ensure output contains valid stack map tables. context: https://github.com/bazelbuild/bazel/issues/5855 PiperOrigin-RevId: 208555048
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 5d95ce9..2a488af 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 @@ .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 74aa802..819d063 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