aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/android/tools/r8/shaking/AnnotationRemover.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/android/tools/r8/shaking/AnnotationRemover.java')
-rw-r--r--src/main/java/com/android/tools/r8/shaking/AnnotationRemover.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/main/java/com/android/tools/r8/shaking/AnnotationRemover.java b/src/main/java/com/android/tools/r8/shaking/AnnotationRemover.java
index 824f1bdda..1698f7a71 100644
--- a/src/main/java/com/android/tools/r8/shaking/AnnotationRemover.java
+++ b/src/main/java/com/android/tools/r8/shaking/AnnotationRemover.java
@@ -13,7 +13,6 @@ import com.android.tools.r8.graph.DexItemFactory;
import com.android.tools.r8.graph.DexProgramClass;
import com.android.tools.r8.shaking.Enqueuer.AppInfoWithLiveness;
import com.android.tools.r8.utils.InternalOptions;
-import com.android.tools.r8.utils.InternalOptions.KeepAttributeOptions;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.function.Predicate;
@@ -21,14 +20,13 @@ import java.util.function.Predicate;
public class AnnotationRemover {
private final AppInfoWithLiveness appInfo;
- private final KeepAttributeOptions keep;
+ private final ProguardKeepAttributes keep;
public AnnotationRemover(AppInfoWithLiveness appInfo, InternalOptions options) {
- this(appInfo, options.keepAttributes);
+ this(appInfo, options.proguardConfiguration.getKeepAttributes());
}
- public AnnotationRemover(AppInfoWithLiveness appInfo,
- KeepAttributeOptions keep) {
+ public AnnotationRemover(AppInfoWithLiveness appInfo, ProguardKeepAttributes keep) {
this.appInfo = appInfo;
this.keep = keep;
}
@@ -91,7 +89,7 @@ public class AnnotationRemover {
}
break;
case DexAnnotation.VISIBILITY_BUILD:
- if (!keep.runtimeInvisibleParamterAnnotations) {
+ if (!keep.runtimeInvisibleParameterAnnotations) {
return false;
}
break;