commit 474ad31cabe374a24f5154555148109879ccde93
author Adam Vartanian <flooey@google.com> Wed Dec 05 14:06:14 2018 +0000
committer Adam Vartanian <flooey@google.com> Wed Dec 05 14:26:05 2018 +0000
tree e181420df4038ebe73809567eeb3c5f5f40255ad
parent 047b9f097eec7615976256d4fd7b66c772920da8

Add @Nullable and @NonNull to intra-core API

We want to annotate methods in the new files in external/conscrypt,
which can only depend on libcore via the intra-core API, so we need
access to these annotations.

Bug: 120475246
Test: make checkbuild
Change-Id: Ie7a7a59a84b2d86db1e9ef4499dd596c75f2bb17

non_openjdk_java_files.bp

diff --git a/non_openjdk_java_files.bp b/non_openjdk_java_files.bp
index 9a94a14..d711c9d 100644
--- a/non_openjdk_java_files.bp
+++ b/non_openjdk_java_files.bp
@@ -194,6 +194,8 @@
         "luni/src/main/java/libcore/util/EmptyArray.java",
         "luni/src/main/java/libcore/util/HexEncoding.java",
         "luni/src/main/java/libcore/util/NativeAllocationRegistry.java",
+        "luni/src/main/java/libcore/util/NonNull.java",
+        "luni/src/main/java/libcore/util/Nullable.java",
         "luni/src/main/java/libcore/util/SneakyThrow.java",
         "luni/src/main/java/libcore/util/XmlObjectFactory.java",
         "luni/src/main/java/libcore/util/ZoneInfo.java",