summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Gaston <jeffrygaston@google.com> 2019-11-28 05:42:57 -0800
committer android-build-merger <android-build-merger@google.com> 2019-11-28 05:42:57 -0800
commit8e6c59ef841d2e7e9ead16834d9427151f6cc4fb (patch)
treed5ed1e8d5d662e150e5772f6a7a328e192ce3bd8
parent3262be5183104eb85a4b9cbfef47e96384e66c90 (diff)
parentb70885d3446f9c05dc290cde224023dd0420009f (diff)
Merge "Replacing @Nullable/@NonNull with @RecentlyNullable/@RecentlyNonNull in non-android APIs" am: 8c1b66d30e
am: b70885d344 Change-Id: Iad96f41969e4e413702935925d072349a417e192
-rw-r--r--Android.bp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 5f06a63ceacc..2e8e90786b32 100644
--- a/Android.bp
+++ b/Android.bp
@@ -949,7 +949,8 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x
"--hide CallbackInterface " +
"--hide MissingPermission --hide BroadcastBehavior " +
"--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " +
- "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo "
+ "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " +
+ "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.*"
packages_to_document = [
"android",