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

Commit 37935863 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Remove --ignore-classes-on-classpath argument" am: c02168f5 am:... 

Merge "Remove --ignore-classes-on-classpath argument" am: c02168f5 am: 481ba3e2 am: 8bf15714 am: 297bdc90

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

Change-Id: Ie4aacbc2d596d45016da28ee8ec759a36b2c90d3
parents 2d93cb0f 297bdc90

ApiDocs.bp

+1 −5
Original line number Diff line number Diff line
@@ -108,9 +108,7 @@ droidstubs { 
    arg_files: [

        "core/res/AndroidManifest.xml",

    ],

    args: metalava_framework_docs_args +

        // Needed for hidden libcore annotations for now.

        " --ignore-classes-on-classpath ",

    args: metalava_framework_docs_args,

    write_sdk_values: true,

}
@@ -121,8 +119,6 @@ droidstubs { 
        "core/res/AndroidManifest.xml",

    ],

    args: metalava_framework_docs_args +

        // Needed for hidden libcore annotations for now.

        " --ignore-classes-on-classpath " +

        " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ",

    write_sdk_values: true,

}