commit 727ef103669fbb30ba2ccc9eb77be978589733f5
author Colin Cross <ccross@android.com> Tue Apr 16 23:14:12 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 16 23:14:12 2019 +0000
tree c32eab4a4396313b5b339877384445a5be5e3cde
parent 56215ba93076bc02dcc5c1b46cd1ecfdb375e116
parent e75840fe4dfc77ad28ed6ffca7f37202e272c00a

Merge "Add default proguard flags from guava"

core/proguard_basic_keeps.flags

diff --git a/core/proguard_basic_keeps.flags b/core/proguard_basic_keeps.flags
index 3c25e89..256b2ec 100644
--- a/core/proguard_basic_keeps.flags
+++ b/core/proguard_basic_keeps.flags
@@ -66,5 +66,12 @@
 # See bug/20658265.
 # -dontwarn android.support.**
 
+# From https://github.com/google/guava/wiki/UsingProGuardWithGuava
+# Striped64, LittleEndianByteArray, UnsignedBytes, AbstractFuture
+-dontwarn sun.misc.Unsafe
+# Futures.getChecked (which often won't work with Proguard anyway) uses this. It
+# has a fallback, but again, don't use Futures.getChecked on Android regardless.
+-dontwarn java.lang.ClassValue
+
 # Less spammy.
 -dontnote