commit d6eece37abc60f1438e7a8247e0c89acd449dfdd
author Pete Gillin <peteg@google.com> Thu Jul 19 18:08:06 2018 +0100
committer Pete Gillin <peteg@google.com> Wed Jul 25 11:43:42 2018 +0100
tree dd676da6096e7a313a365f6aaae5b27e981e099f
parent 6c32f5d18e1af7d4e2cd231577636d5dd9277719

Turn droiddoc's metalava_merge_annotations_dir into a list.

This change replaces droiddoc's metalava_merge_annotations_dir
parameter (which takes a single value) with
metalava_merge_annotations_dirs (which takes a list). This will makes
it possible to merge libcore annotations in from a separate directory
under ojluni, instead of adding them in a preprocessing step.

Test: `make metalava-api-stubs-docs` with a local change to add a second directory
Bug: 111639530
Change-Id: I8eb778038c1cb52ddb6fc86d972f555f49e836b2

Android.bp

diff --git a/Android.bp b/Android.bp
index c682822..80afd48 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1141,7 +1141,9 @@
     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 {