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

am: 8c8fb65ad3 Change-Id: I33e614584ec7b445b35872d0b84d5224c6f7c4af
2018-07-25 10:15:02 -07:00
parent 7393f85a6e 8c8fb65ad3
commit c2b639218e
1 changed files with 3 additions and 1 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -1265,7 +1265,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 {