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

Commit 149a740b authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Automerger Merge Worker
Browse files

Merge "doclava: include "Added in API <version>" in offline docs" am:... 

Merge "doclava: include "Added in API <version>" in offline docs" am: 70d5e724 am: 5b95908b am: e63e2ea4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2308779



Change-Id: Ie66924dec5b00ed164234ba2f5ad9a39adafe5f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 32a6f818 e63e2ea4

ApiDocs.bp

+2 −1
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ droidstubs { 
/////////////////////////////////////////////////////////////////////



framework_docs_only_args = " -android -manifest $(location core/res/AndroidManifest.xml) " +

    "-metalavaApiSince " +

    "-werror -lerror -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 " +

    "-overview $(location core/java/overview.html) " +

    // Federate Support Library references against local API file.
@@ -374,7 +375,7 @@ droiddoc { 
    ],

    proofread_file: "ds-docs-proofread.txt",

    args: framework_docs_only_args +

        " -toroot / -yamlV2 -metalavaApiSince -samplegroup Admin " +

        " -toroot / -yamlV2 -samplegroup Admin " +

        " -samplegroup Background " +

        " -samplegroup Connectivity " +

        " -samplegroup Content " +