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

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

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

Merge "Change the default docs build to use module stubs" am: 0fbf3439 am: 9f6049ee am: 88c210a1 am: 01106ef1

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

Change-Id: Ie8c5d71cf7978bcce89173b5e0c18679f7d3975a
parents 5a87b681 01106ef1

ApiDocs.bp

+1 −11
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ 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"],
@@ -146,12 +145,6 @@ 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"],
@@ -160,11 +153,8 @@ 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-module-stubs",

    name: "framework-doc-stubs",

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

    args: metalava_framework_docs_args,

    srcs: [