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

Browse Source 
am: d12b7f790d

Change-Id: I97e9920bfb5cf7f97a0efd5f0079fef9a50b67a3
This commit is contained in:
Pete Gillin
2018-07-25 10:38:08 -07:00
committed by android-build-merger
parent cae7c2e953 d12b7f790d
commit 9afc75d604
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

@@ -1278,7 +1278,9 @@ doc_defaults {
metalava_enabled: true, metalava_enabled: true,
metalava_annotations_enabled: true, metalava_annotations_enabled: true,
metalava_previous_api: ":public-api-for-metalava-annotations", metalava_previous_api: ":public-api-for-metalava-annotations",
metalava_merge_annotations_dir: "tools/metalava/manual", metalava_merge_annotations_dirs: [
"tools/metalava/manual",
],
} }
droiddoc { droiddoc {