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

Commit c2b63921 authored by Pete Gillin's avatar Pete Gillin Committed by android-build-merger
Browse files

Merge "Turn droiddoc's metalava_merge_annotations_dir into a list." 

am: 8c8fb65a

Change-Id: I33e614584ec7b445b35872d0b84d5224c6f7c4af
parents 7393f85a 8c8fb65a

Android.bp

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