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

2018-07-25 16:02:48 +00:00
parent 6c32f5d18e d6eece37ab
commit 8c8fb65ad3
1 changed files with 3 additions and 1 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -1141,7 +1141,9 @@ doc_defaults {
    metalava_enabled: true,
    metalava_annotations_enabled: true,
    metalava_previous_api: ":public-api-for-metalava-annotations",
-    metalava_merge_annotations_dir: "tools/metalava/manual",
+    metalava_merge_annotations_dirs: [
+        "tools/metalava/manual",
+    ],
 }

 droiddoc {