diff options
| author | 2018-07-25 16:02:48 +0000 | |
|---|---|---|
| committer | 2018-07-25 16:02:48 +0000 | |
| commit | 8c8fb65ad322fbdb7f3580797a2caa7147f979c2 (patch) | |
| tree | dd676da6096e7a313a365f6aaae5b27e981e099f | |
| parent | 6c32f5d18e1af7d4e2cd231577636d5dd9277719 (diff) | |
| parent | d6eece37abc60f1438e7a8247e0c89acd449dfdd (diff) | |
Merge "Turn droiddoc's metalava_merge_annotations_dir into a list."
| -rw-r--r-- | Android.bp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index c6828227f347..80afd48879ad 100644 --- 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 { |