From 4731ab72826e0bb2fcd72c0a2cc819d7ddcb7307 Mon Sep 17 00:00:00 2001 From: Sam Delmerico Date: Tue, 31 Jan 2023 20:14:18 +0000 Subject: [PATCH] Revert "remove unneeded dontwarn settings" This reverts commit 59570d1e646f2dd2d8173edc9fa47c0c420fb31f. Reason for revert: we still need these flags Change-Id: I8caa6350f0b62e6aa2a190e128d5ce7d8f849ea8 --- core/proguard_basic_keeps.flags | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/core/proguard_basic_keeps.flags b/core/proguard_basic_keeps.flags index ea200c187f..7e7b2701ca 100644 --- a/core/proguard_basic_keeps.flags +++ b/core/proguard_basic_keeps.flags @@ -83,14 +83,13 @@ # 1) runtime-visible annotations will still be kept, and 2) compile-time # annotations are stripped by R8 anyway. # Note: The ** prefix is used to accommodate jarjar repackaging. -# TODO(b/266561579): Remove this exemptions after resolving jarjar-ed transitive libs +# TODO(b/242088131): Remove these exemptions after resolving transitive libs +# dependencies that are provided to R8. -dontwarn **android**.annotation*.** - -# These classes generate warnings of the kind `Library class extends program class` -# because some apps have deps that statically include the same libraries as the app, -# and r8 complains that a library is implementing a class provided by the app (the "program"). --dontwarn com.google.protobuf.** --dontwarn kotlin.reflect.jvm.internal.ReflectionFactoryImpl +-dontwarn **com.google.errorprone.annotations.** +-dontwarn javax.annotation.** +-dontwarn org.checkerframework.** +-dontwarn org.jetbrains.annotations.** # Less spammy. -dontnote