Merge "Turn droiddoc's metalava_merge_annotations_dir into a list."

This commit is contained in:
Treehugger Robot
2018-07-25 16:02:48 +00:00
committed by Gerrit Code Review

View File

@@ -1141,7 +1141,9 @@ doc_defaults {
metalava_enabled: true, metalava_enabled: true,
metalava_annotations_enabled: true, metalava_annotations_enabled: true,
metalava_previous_api: ":public-api-for-metalava-annotations", metalava_previous_api: ":public-api-for-metalava-annotations",
metalava_merge_annotations_dir: "tools/metalava/manual", metalava_merge_annotations_dirs: [
"tools/metalava/manual",
],
} }
droiddoc { droiddoc {