Remove ICU and Conscrypt source from nullability validation
The core-current-stubs-nullability-validation rule runs on source from
I18N and Conscrypt modules as well as the ART module. That prevents
unbundling. However, it seems as though no nullability checks are
actually performed on the I18N and Conscrypt code so removing them will
not reduce the effectiveness of the checks.
Renamed the rule to art-module-public-api-stubs-nullability-validation
which more accurately reflects what it is doing.
Also, replaced "make ...." with "m ..." in the comments as use of make
was previously deprecated.
Bug: 141613583
Bug: 142060419
Test: m
Change-Id: I6340356ef7a1f877e1fdf03dc812d092809b6357
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 1a6c6a9..fc11a93 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -823,14 +823,14 @@
// Target for validating nullability annotations for correctness and
// completeness. To check that there are no nullability errors:
-// make core-current-stubs-nullability-validation
+// m art-module-public-api-stubs-nullability-validation
// To check that there are only the expected nullability warnings:
-// make core-current-stubs-nullability-validation-check-nullability-warnings
+// m art-module-public-api-stubs-nullability-validation-check-nullability-warnings
// To update the the list of known expected nullability warnings:
-// make core-current-stubs-nullability-validation-update-nullability-warnings
+// m art-module-public-api-stubs-nullability-validation-update-nullability-warnings
droidstubs {
- name: "core-current-stubs-nullability-validation",
- srcs: [":core_api_files"],
+ name: "art-module-public-api-stubs-nullability-validation",
+ srcs: [":art_module_api_files"],
installable: false,
sdk_version: "none",
annotations_enabled: true,