Add j.a.p.Generated to ART's Public API surface
Certain code generation tools like Dagger emit this annotation. Add this
to Public API surface to enable apps to use these annotation processors.
Another option was to add this to the new "Toolchain" API surface
instead. e.g. LambdaMetaFactory (LMF) was added to Toolchain API surface
and not Public API in aosp/2369873. One difference is that unlike LMF,
j.a.p.Generated is part of JLS and is backed by an implementation.
Bug: 261244752
Bug: 283243108
Test: TH
Change-Id: I29122adc5ee9d7cafd5403ac5421a7b0d9737dd1
diff --git a/openjdk_java_files.bp b/openjdk_java_files.bp
index 3f1005e..73d01b0 100644
--- a/openjdk_java_files.bp
+++ b/openjdk_java_files.bp
@@ -1235,6 +1235,7 @@
"ojluni/src/main/java/java/util/zip/ZipOutputStream.java",
"ojluni/src/main/java/java/util/zip/ZipUtils.java",
"ojluni/src/main/java/java/util/zip/ZStreamRef.java",
+ "ojluni/src/main/java/javax/annotation/processing/Generated.java",
"ojluni/src/main/java/javax/crypto/AEADBadTagException.java",
"ojluni/src/main/java/javax/crypto/BadPaddingException.java",
"ojluni/src/main/java/javax/crypto/CipherInputStream.java",
@@ -1404,21 +1405,6 @@
],
}
-// Stubs needed to satisfy javac when compiling source code that contains
-// @Generated annotations, which are produced by some code generation tools.
-// TODO: Remove this source file, this target, and all its dependencies, if
-// the code generation tools (notably dagger) can be fixed.
-// See http://b/123891440.
-filegroup {
- name: "openjdk_generated_annotation_stub_files",
- visibility: [
- "//libcore:__subpackages__",
- ],
- srcs: [
- "ojluni/src/generated-annotation/java/javax/annotation/processing/Generated.java",
- ],
-}
-
// Classes which are exposed in the intra-core or core-platform APIs but not in
// the public APIs. Unless they are annotated, these classes and all their
// members will be exposed in all such APIs. To avoid patching the main ojluni
@@ -1863,7 +1849,6 @@
":openjdk_mmodule_extra_files",
":openjdk_internal_files",
":openjdk_lambda_stub_files",
- ":openjdk_generated_annotation_stub_files",
],
}