Remove all uses of @KeepForRetraceApi
Bug: b/304992619
Change-Id: I2a3cf7f523ee4efd8c8ca22662ce3c32734d360e
diff --git a/src/main/java/com/android/tools/r8/KeepForRetraceApi.java b/src/main/java/com/android/tools/r8/KeepForRetraceApi.java
deleted file mode 100644
index 5ed253c..0000000
--- a/src/main/java/com/android/tools/r8/KeepForRetraceApi.java
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2021, the R8 project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-package com.android.tools.r8;
-
-@KeepForRetraceApi
-public @interface KeepForRetraceApi {}
diff --git a/src/main/java/com/android/tools/r8/references/ArrayReference.java b/src/main/java/com/android/tools/r8/references/ArrayReference.java
index 5857e9e..bcd7a94 100644
--- a/src/main/java/com/android/tools/r8/references/ArrayReference.java
+++ b/src/main/java/com/android/tools/r8/references/ArrayReference.java
@@ -3,7 +3,6 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.references;
-import com.android.tools.r8.KeepForRetraceApi;
import com.android.tools.r8.errors.Unreachable;
import com.android.tools.r8.keepanno.annotations.KeepForApi;
import com.android.tools.r8.utils.DescriptorUtils;
@@ -11,7 +10,6 @@
/** Reference to an array type. */
@KeepForApi
-@KeepForRetraceApi
public final class ArrayReference implements TypeReference {
private final int dimensions;
diff --git a/src/main/java/com/android/tools/r8/references/ClassReference.java b/src/main/java/com/android/tools/r8/references/ClassReference.java
index 006ff2c..08891ae 100644
--- a/src/main/java/com/android/tools/r8/references/ClassReference.java
+++ b/src/main/java/com/android/tools/r8/references/ClassReference.java
@@ -3,13 +3,11 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.references;
-import com.android.tools.r8.KeepForRetraceApi;
import com.android.tools.r8.keepanno.annotations.KeepForApi;
import com.android.tools.r8.utils.DescriptorUtils;
/** Reference to a class type or interface type. */
@KeepForApi
-@KeepForRetraceApi
public final class ClassReference implements TypeReference {
private final String descriptor;
diff --git a/src/main/java/com/android/tools/r8/references/FieldReference.java b/src/main/java/com/android/tools/r8/references/FieldReference.java
index ce27cb9..4e09c36 100644
--- a/src/main/java/com/android/tools/r8/references/FieldReference.java
+++ b/src/main/java/com/android/tools/r8/references/FieldReference.java
@@ -3,7 +3,6 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.references;
-import com.android.tools.r8.KeepForRetraceApi;
import com.android.tools.r8.keepanno.annotations.KeepForApi;
import java.util.Objects;
@@ -14,7 +13,6 @@
* type of the field.
*/
@KeepForApi
-@KeepForRetraceApi
public final class FieldReference {
private final ClassReference holderClass;
private final String fieldName;
diff --git a/src/main/java/com/android/tools/r8/references/MethodReference.java b/src/main/java/com/android/tools/r8/references/MethodReference.java
index 1582789..788f1d9 100644
--- a/src/main/java/com/android/tools/r8/references/MethodReference.java
+++ b/src/main/java/com/android/tools/r8/references/MethodReference.java
@@ -3,7 +3,6 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.references;
-import com.android.tools.r8.KeepForRetraceApi;
import com.android.tools.r8.keepanno.annotations.KeepForApi;
import com.android.tools.r8.utils.StringUtils;
import com.android.tools.r8.utils.StringUtils.BraceType;
@@ -17,7 +16,6 @@
* full list of formal parameters.
*/
@KeepForApi
-@KeepForRetraceApi
public final class MethodReference {
private final ClassReference holderClass;
private final String methodName;
diff --git a/src/main/java/com/android/tools/r8/references/PackageReference.java b/src/main/java/com/android/tools/r8/references/PackageReference.java
index ed3a3a6..1bb9752 100644
--- a/src/main/java/com/android/tools/r8/references/PackageReference.java
+++ b/src/main/java/com/android/tools/r8/references/PackageReference.java
@@ -4,14 +4,12 @@
package com.android.tools.r8.references;
-import com.android.tools.r8.KeepForRetraceApi;
import com.android.tools.r8.keepanno.annotations.KeepForApi;
import com.android.tools.r8.utils.DescriptorUtils;
import java.util.Objects;
/** Reference to a package. */
@KeepForApi
-@KeepForRetraceApi
public class PackageReference {
private final String packageName;
diff --git a/src/main/java/com/android/tools/r8/references/PrimitiveReference.java b/src/main/java/com/android/tools/r8/references/PrimitiveReference.java
index c01a5f1..5b399c4 100644
--- a/src/main/java/com/android/tools/r8/references/PrimitiveReference.java
+++ b/src/main/java/com/android/tools/r8/references/PrimitiveReference.java
@@ -3,12 +3,10 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.references;
-import com.android.tools.r8.KeepForRetraceApi;
import com.android.tools.r8.errors.Unreachable;
import com.android.tools.r8.keepanno.annotations.KeepForApi;
@KeepForApi
-@KeepForRetraceApi
public abstract class PrimitiveReference implements TypeReference {
static final PrimitiveReference BOOL =
diff --git a/src/main/java/com/android/tools/r8/references/Reference.java b/src/main/java/com/android/tools/r8/references/Reference.java
index 9f43c5e..a5d015d 100644
--- a/src/main/java/com/android/tools/r8/references/Reference.java
+++ b/src/main/java/com/android/tools/r8/references/Reference.java
@@ -3,7 +3,6 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.references;
-import com.android.tools.r8.KeepForRetraceApi;
import com.android.tools.r8.keepanno.annotations.KeepForApi;
import com.android.tools.r8.utils.DescriptorUtils;
import com.google.common.collect.ImmutableList;
@@ -24,7 +23,6 @@
* <p>No guarantees are made on identity and all references must be compared by {@code equals}.
*/
@KeepForApi
-@KeepForRetraceApi
public final class Reference {
public static PrimitiveReference BOOL = PrimitiveReference.BOOL;
diff --git a/src/main/java/com/android/tools/r8/references/TypeReference.java b/src/main/java/com/android/tools/r8/references/TypeReference.java
index eb05d39..8318760 100644
--- a/src/main/java/com/android/tools/r8/references/TypeReference.java
+++ b/src/main/java/com/android/tools/r8/references/TypeReference.java
@@ -3,12 +3,10 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.references;
-import com.android.tools.r8.KeepForRetraceApi;
import com.android.tools.r8.keepanno.annotations.KeepForApi;
import com.android.tools.r8.utils.DescriptorUtils;
@KeepForApi
-@KeepForRetraceApi
public interface TypeReference {
/**
diff --git a/src/main/keep.txt b/src/main/keep.txt
index ffd71aa..2aba17e 100644
--- a/src/main/keep.txt
+++ b/src/main/keep.txt
@@ -4,9 +4,6 @@
-keepclasseswithmembers class * { @com.android.tools.r8.KeepMethodForCompileDump <methods>; }
-# Keep all things that can be reached from the retrace api and keep the annotation
--keep @com.android.tools.r8.KeepForRetraceApi class * { public *; }
-
-keep public class com.android.tools.r8.D8 { public static void main(java.lang.String[]); }
-keep public class com.android.tools.r8.R8 { public static void main(java.lang.String[]); }
-keep public class com.android.tools.r8.ExtractMarker { public static void main(java.lang.String[]); }
diff --git a/src/main/keep_retrace.txt b/src/main/keep_retrace.txt
deleted file mode 100644
index 4999d2e..0000000
--- a/src/main/keep_retrace.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2021, the R8 project authors. Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# The retrace api is separated out without repackaging which is why this broad
-# rule is used.
--keep public class com.android.tools.r8.retrace.* {
- public <methods>;
- public <fields>;
- }
--keepattributes SourceFile, LineNumberTable, InnerClasses, EnclosingMethod, Exceptions, Signature
--keepparameternames
-
--repackageclasses com.android.tools.r8.retrace_internal
-
-# Keep all things that can be reached from the retrace api
--keep @com.android.tools.r8.KeepForRetraceApi class * { public *; }
-
--keep,allowshrinking @com.android.tools.r8.Keep class * { public *; }
-
--keep public class com.android.tools.r8.Version { public static final java.lang.String LABEL; }
--keep public class com.android.tools.r8.Version { public static java.lang.String getVersionString(); }
--keep public class com.android.tools.r8.Version { public static int getMajorVersion(); }
--keep public class com.android.tools.r8.Version { public static int getMinorVersion(); }
--keep public class com.android.tools.r8.Version { public static int getPatchVersion(); }
--keep public class com.android.tools.r8.Version { public static java.lang.String getPreReleaseString(); }
--keep public class com.android.tools.r8.Version { public static boolean isDevelopmentVersion(); }
