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

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

Merge "Revert "Change the default docs build to use module stubs"" am:... 

Merge "Revert "Change the default docs build to use module stubs"" am: 56e85bb8 am: d23ac265 am: 221a2267

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

Change-Id: I0d9d090fb562ed3e7f6bcfec7457145e192631f8
parents 01106ef1 221a2267

ApiDocs.bp

+11 −1
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ stubs_defaults { 
}



// Defaults module for doc-stubs targets that use module source code as input.

// This is the default/normal.

stubs_defaults {

    name: "framework-doc-stubs-sources-default",

    defaults: ["framework-doc-stubs-default"],
@@ -145,6 +146,12 @@ droidstubs { 
        " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ",

}



droidstubs {

    name: "framework-doc-stubs",

    defaults: ["framework-doc-stubs-sources-default"],

    args: metalava_framework_docs_args,

}



droidstubs {

    name: "framework-doc-system-stubs",

    defaults: ["framework-doc-stubs-sources-default"],
@@ -153,8 +160,11 @@ droidstubs { 
    api_levels_sdk_type: "system",

}



// Experimental target building doc stubs with module stub source code as input.

// This is intended to eventually replace framework-doc-stubs, once all diffs

// have been eliminated.

droidstubs {

    name: "framework-doc-stubs",

    name: "framework-doc-stubs-module-stubs",

    defaults: ["framework-doc-stubs-default"],

    args: metalava_framework_docs_args,

    srcs: [