Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 9afc75d604

Change-Id: I749d8e74403a91794526a91c6b538e8ed49113f4
This commit is contained in:
Pete Gillin
2018-07-25 10:51:27 -07:00
committed by android-build-merger
parent 99a568088d 9afc75d604
commit cfe95a13dd
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Android.bp
View File

@@ -1282,7 +1282,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 {