summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nan Zhang <nanzhang@google.com> 2018-06-18 12:13:35 -0700
committer android-build-merger <android-build-merger@google.com> 2018-06-18 12:13:35 -0700
commit0da95a5d64bbb641a6ed7ea5fec4f47e8ad039e7 (patch)
treeaeeb5ffd9bbb49ca0045b2757df639fd385787cf
parentea044ca3734342e411cbe0b8bcd4c24b9da19c51 (diff)
parent79d3bf6e54b7651f228c7904da99a33655c4d712 (diff)
Merge "Enabled annotations for Metalava based api-stubs."
am: 79d3bf6e54 Change-Id: I8b91e2259ce3b15313d5d4b822bf77696a6ebd5b
-rw-r--r--Android.bp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 94e85db6dea9..c8789bf0405c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1239,6 +1239,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 {