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

Commit ef969fb6 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Take module APIs out of the module_current stubs am: 822cdb30 am: de6df6c7 am: 9d66b028 

Change-Id: I044ccb8895d3bb67c73456a0ef11c31edfe183d4
parents 13e192c9 9d66b028

StubLibraries.bp

+17 −10
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ packages_to_document = [ 
]

]





stubs_defaults {

stubs_defaults {

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

    name: "metalava-base-api-stubs-default",

    srcs: [

    srcs: [

        ":framework-non-updatable-sources",

        ":framework-non-updatable-sources",

        "core/java/**/*.logtags",

        "core/java/**/*.logtags",
@@ -66,12 +66,18 @@ stubs_defaults { 
}

}





stubs_defaults {

stubs_defaults {

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

    name: "metalava-full-api-stubs-default",

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

    defaults: ["metalava-base-api-stubs-default"],

    srcs: [":framework-updatable-sources"],

    srcs: [":framework-updatable-sources"],

    sdk_version: "core_platform",

    sdk_version: "core_platform",

}

}





stubs_defaults {

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

    defaults: ["metalava-base-api-stubs-default"],

    sdk_version: "system_current",

}



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

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

// *-api-stubs-docs modules providing source files for the stub libraries

// *-api-stubs-docs modules providing source files for the stub libraries

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

/////////////////////////////////////////////////////////////////////
@@ -81,7 +87,7 @@ stubs_defaults { 
// modules

// modules

droidstubs {

droidstubs {

    name: "api-stubs-docs",

    name: "api-stubs-docs",

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

    defaults: ["metalava-full-api-stubs-default"],

    api_filename: "public_api.txt",

    api_filename: "public_api.txt",

    private_api_filename: "private.txt",

    private_api_filename: "private.txt",

    removed_api_filename: "removed.txt",

    removed_api_filename: "removed.txt",
@@ -120,7 +126,7 @@ module_libs = " " + 




droidstubs {

droidstubs {

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

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

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

    defaults: ["metalava-full-api-stubs-default"],

    api_tag_name: "SYSTEM",

    api_tag_name: "SYSTEM",

    api_filename: "system-api.txt",

    api_filename: "system-api.txt",

    private_api_filename: "system-private.txt",

    private_api_filename: "system-private.txt",
@@ -151,7 +157,7 @@ droidstubs { 




droidstubs {

droidstubs {

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

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

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

    defaults: ["metalava-full-api-stubs-default"],

    api_tag_name: "TEST",

    api_tag_name: "TEST",

    api_filename: "test-api.txt",

    api_filename: "test-api.txt",

    removed_api_filename: "test-removed.txt",

    removed_api_filename: "test-removed.txt",
@@ -184,7 +190,7 @@ droidstubs { 




droidstubs {

droidstubs {

    name: "module-lib-api",

    name: "module-lib-api",

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

    defaults: ["metalava-full-api-stubs-default"],

    arg_files: ["core/res/AndroidManifest.xml"],

    arg_files: ["core/res/AndroidManifest.xml"],

    args: metalava_framework_docs_args + module_libs,

    args: metalava_framework_docs_args + module_libs,

    check_api: {

    check_api: {
@@ -212,7 +218,7 @@ droidstubs { 




droidstubs {

droidstubs {

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

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

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

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

    arg_files: ["core/res/AndroidManifest.xml"],

    arg_files: ["core/res/AndroidManifest.xml"],

    args: metalava_framework_docs_args + priv_apps + module_libs,

    args: metalava_framework_docs_args + priv_apps + module_libs,

}

}
@@ -262,6 +268,7 @@ java_library_static { 
    name: "android_module_lib_stubs_current",

    name: "android_module_lib_stubs_current",

    srcs: [ ":module-lib-api-stubs-docs" ],

    srcs: [ ":module-lib-api-stubs-docs" ],

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

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

    libs: ["android_system_stubs_current"],

}

}





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

/////////////////////////////////////////////////////////////////////
@@ -313,7 +320,7 @@ java_library_static { 




droidstubs {

droidstubs {

    name: "hiddenapi-lists-docs",

    name: "hiddenapi-lists-docs",

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

    defaults: ["metalava-full-api-stubs-default"],

    arg_files: [

    arg_files: [

        "core/res/AndroidManifest.xml",

        "core/res/AndroidManifest.xml",

    ],

    ],
@@ -328,7 +335,7 @@ droidstubs { 




droidstubs {

droidstubs {

    name: "hiddenapi-mappings",

    name: "hiddenapi-mappings",

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

    defaults: ["metalava-full-api-stubs-default"],

    srcs: [

    srcs: [

        ":opt-telephony-common-srcs",

        ":opt-telephony-common-srcs",

    ],

    ],