Merge "Turn droiddoc's metalava_merge_annotations_dir into a list." am: 8c8fb65ad3 am: c2b639218e

am: d12b7f790d Change-Id: I97e9920bfb5cf7f97a0efd5f0079fef9a50b67a3
2018-07-25 10:38:08 -07:00
parent cae7c2e953 d12b7f790d
commit 9afc75d604
1 changed files with 3 additions and 1 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -1278,7 +1278,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 {