Move .annotated.java files into an 'sdk' subdirectory.
All of the current annotations are intended for use in the SDK build,
and live at ojluni/annotations. In order to make room for annotated
stubs for other purposes, this change moves them. There is a README
that describes the intended directory structure. (N.B. Validation of
the nullability stubs is not landed yet but is described here in
anticipation.)
Bug: 115746226
Test: `make api-stubs-docs`
Change-Id: I7cfbdb5dc9888f796eb1f384155fce33125a7d9e
diff --git a/ojluni/annotations/README b/ojluni/annotations/README
new file mode 100644
index 0000000..aa7c781
--- /dev/null
+++ b/ojluni/annotations/README
@@ -0,0 +1,16 @@
+This directory contains annotated stub files which can be merged into
+the main source files by metalava when it is producing API stubs. This
+mechanism is used instead of adding the annotations to the main source
+files, to avoid carrying patches against the upstream sources.
+
+Directory structure
+===================
+
+libcore/ojluni/annotations/sdk:
+ - Contains annotations to be included in the public SDK, for example
+ annotations specifying additional details about method contracts.
+
+libcore/ojluni/annotations/sdk/nullability:
+ - Contains annotations to be included in the public SDK specifically
+ relating to nullability. Adding an annotated stub file to this subdirectory
+ will cause the annotations to be validated for correctness and completeness.