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

Commit d12b7f79 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 

am: c2b63921

Change-Id: Iafe5f91b31e00d171ef50360adb3cb90c0128ddf
parents d8058375 c2b63921

Android.bp

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