summaryrefslogtreecommitdiff
path: root/JavaLibrary.bp
diff options
context:
space:
mode:
authorPete Gillin <peteg@google.com>2018-11-14 18:42:19 +0000
committerPete Gillin <peteg@google.com>2018-11-14 19:00:22 +0000
commitc5f179b04e58be2eefab1ad5e658d357a02b78c2 (patch)
tree3e7056b7239416942857c351f0f047d3f2a57850 /JavaLibrary.bp
parentd260231f0cb1148623b3e8b387d28269b8e08d27 (diff)
Turn on nullability annotation for the non-ojluni classes.
Previously, libcore does nullability validation of ojluni classes, using the existence of nullability stub files to indicate which classes to validate. This change turns on validation for classes which are annotated directly in the source rather than using stubs, by listing them explicitly. This change also adds one annotation previously missing from BigInteger (which was found by this validation). Test: core-current-stubs-nullability-validation-check-nullability-warnings Bug: 73448108 Bug: 64930165 Change-Id: I21fcf45c4c58ec9b93333efbdd29de3eca2f3e81
Diffstat (limited to 'JavaLibrary.bp')
-rw-r--r--JavaLibrary.bp3
1 files changed, 3 insertions, 0 deletions
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 6c2640c368..8278e6d8f3 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -659,6 +659,9 @@ droidstubs {
// N.B. Stubs in this filegroup will be validated:
"ojluni-annotated-nullability-stubs",
],
+ // The list of classes which have nullability annotations included in the source.
+ // (This is in addition to those which have annotations in the merged stubs.)
+ validate_nullability_from_list: "nullability_annotated_classes.txt",
// The expected set of warnings about missing annotations:
check_nullability_warnings: "nullability_warnings.txt",
}