Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6eece37 authored by Pete Gillin's avatar Pete Gillin
Browse files

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
parent 6c32f5d1

Android.bp

+3 −1
Original line number Original line Diff line number Diff line
@@ -1141,7 +1141,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 {