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

Commit cfe95a13 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:... 

Merge "Turn droiddoc's metalava_merge_annotations_dir into a list." am: 8c8fb65a am: c2b63921 am: d12b7f79
am: 9afc75d6

Change-Id: I749d8e74403a91794526a91c6b538e8ed49113f4
parents 99a56808 9afc75d6

Android.bp

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