Merge "Enabled annotations for Metalava based api-stubs." am: 79d3bf6e54

am: 0da95a5d64 Change-Id: Ie3385442c0bf28a1da52cb2d687ed45921604f80
2018-06-18 12:37:13 -07:00
parent e7f0de228b 0da95a5d64
commit 7c96332354
1 changed files with 3 additions and 0 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -1252,6 +1252,9 @@ doc_defaults {
    local_sourcepaths: frameworks_base_subdirs,
    installable: false,
    metalava_enabled: true,
+    metalava_annotations_enabled: true,
+    metalava_previous_api: ":public-api-for-metalava-annotations",
+    metalava_merge_annotations_dir: "tools/metalava/manual",
 }

 droiddoc {