Merge "Enable annotations for framework stubs" into rvc-dev am: 517edf62c8 am: 72ffcfced9

Change-Id: I5273fe4a1a7f6859a770f58f7223d4a1dc15e854
2020-05-28 10:49:44 +00:00
parent b26855f1bb 72ffcfced9
commit 45384d6e20
1 changed files with 2 additions and 0 deletions
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -100,6 +100,8 @@ java_defaults {
    // Configure framework module specific metalava options.
    droiddoc_options: [mainline_stubs_args],

+    annotations_enabled: true,
+
    // The stub libraries must be visible to frameworks/base so they can be combined
    // into API specific libraries.
    stubs_library_visibility: [