drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Turn droiddoc's metalava_merge_annotations_dir into a list.

Browse Source 
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
This commit is contained in:
Pete Gillin 2018-07-19 18:08:06 +01:00
parent 6c32f5d18e
commit d6eece37ab
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Android.bp
View File

@ -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 {