Annotate APIs in ojluni/ with @SystemApi(MODULE_LIBRARIES)
Test: m droid
Test: Verified no diff from the STABLE @CorePlatformApi by running the
following command: diff api/module-lib-current.txt mmodules/core_platform_api/api/stable_platform/current.txt
Change-Id: I2233f90415482391a9d51ed48aab5a29caa85832
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index dcc89ca..0047c3a 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -890,6 +890,13 @@
srcs: [
":core_oj_api_files",
":core_libart_api_files",
+
+ // Some source files in :core_oj_api_files and :openjdk_mmodule_extra_files are
+ // annotated by applying annotations to the .annotated.java stubs files in
+ // ojluni/annotated/mmodules and rather than in the original source. See the comments
+ // in openjdk_java_files.bp for more details.
+ ":openjdk_mmodule_extra_files",
+
],
libs: [
// Put framework-api-annotations into libs to avoid exposing the definition of framework's
@@ -921,8 +928,10 @@
droiddoc_options: [
rewrite_openjdk_doc_args,
"--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.* ",
+ "--hide-annotation libcore.api.Hide",
],
+ merge_inclusion_annotations_dirs: ["ojluni-annotated-mmodule-stubs"],
// Emit nullability annotations from the source to the stub files.
annotations_enabled: true,