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

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

Merge "Remove defaults that add nothing" am: 4c11ce8e am: f8319bd6 

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

Change-Id: I7869d9cad9ac70df5246047cc508da0116f1d981
parents 1f0a6f7d f8319bd6

StubLibraries.bp

+4 −15
Original line number Diff line number Diff line
@@ -23,24 +23,13 @@ 
// and comparing them against the checked in API signature, and also checking compatibility

// with the latest frozen API signature.



/////////////////////////////////////////////////////////////////////

// Common metalava configs

/////////////////////////////////////////////////////////////////////



stubs_defaults {

    name: "metalava-non-updatable-api-stubs-default",

    defaults: ["android-non-updatable-stubs-defaults"],

    api_levels_annotations_enabled: false,

    defaults_visibility: ["//visibility:private"],

}



/////////////////////////////////////////////////////////////////////

// These modules provide source files for the stub libraries

/////////////////////////////////////////////////////////////////////



droidstubs {

    name: "api-stubs-docs-non-updatable",

    defaults: ["metalava-non-updatable-api-stubs-default"],

    defaults: ["android-non-updatable-stubs-defaults"],

    args: metalava_framework_docs_args,

    check_api: {

        current: {
@@ -89,7 +78,7 @@ module_libs = " --show-annotation android.annotation.SystemApi\\(" + 


droidstubs {

    name: "system-api-stubs-docs-non-updatable",

    defaults: ["metalava-non-updatable-api-stubs-default"],

    defaults: ["android-non-updatable-stubs-defaults"],

    args: metalava_framework_docs_args + priv_apps,

    check_api: {

        current: {
@@ -125,7 +114,7 @@ droidstubs { 


droidstubs {

    name: "test-api-stubs-docs-non-updatable",

    defaults: ["metalava-non-updatable-api-stubs-default"],

    defaults: ["android-non-updatable-stubs-defaults"],

    args: metalava_framework_docs_args + test + priv_apps_in_stubs,

    check_api: {

        current: {
@@ -167,7 +156,7 @@ droidstubs { 


droidstubs {

    name: "module-lib-api-stubs-docs-non-updatable",

    defaults: ["metalava-non-updatable-api-stubs-default"],

    defaults: ["android-non-updatable-stubs-defaults"],

    args: metalava_framework_docs_args + priv_apps_in_stubs + module_libs,

    check_api: {

        current: {