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

Commit 43b3f4df authored by Jihoon Kang's avatar Jihoon Kang Committed by Automerger Merge Worker
Browse files

Merge "Add module lib and test union java_api_library module" into main am:... 

Merge "Add module lib and test union java_api_library module" into main am: d135292f am: 1385c170 am: fc238577

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



Change-Id: Iae4998018d97bb7992f220f18f686074f771f7da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 09754592 fc238577

api/StubLibraries.bp

+44 −0
Original line number Diff line number Diff line
@@ -436,6 +436,26 @@ java_api_library { 
    full_api_surface_stub: "android_module_lib_stubs_current_full.from-text",

}



// This module generates a stub jar that is a union of the test and module lib

// non-updatable api contributions. Modules should not depend on the stub jar

// generated from this module, as this module is strictly used for hiddenapi only.

java_api_library {

    name: "android-non-updatable.stubs.test_module_lib",

    api_surface: "module_lib",

    api_contributions: [

        "api-stubs-docs-non-updatable.api.contribution",

        "system-api-stubs-docs-non-updatable.api.contribution",

        "test-api-stubs-docs-non-updatable.api.contribution",

        "module-lib-api-stubs-docs-non-updatable.api.contribution",

    ],

    defaults: ["android-non-updatable_from_text_defaults"],

    full_api_surface_stub: "android_test_module_lib_stubs_current.from-text",



    // This module is only used for hiddenapi, and other modules should not

    // depend on this module.

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

}



java_defaults {

    name: "android_stubs_dists_default",

    dist: {
@@ -738,6 +758,30 @@ java_api_library { 
    visibility: ["//visibility:public"],

}



java_api_library {

    name: "android_test_module_lib_stubs_current.from-text",

    api_surface: "module-lib",

    defaults: [

        "android_stubs_current_contributions",

        "android_system_stubs_current_contributions",

        "android_test_stubs_current_contributions",

        "android_module_lib_stubs_current_contributions",

    ],

    libs: [

        "android_module_lib_stubs_current_full.from-text",

        "stub-annotations",

    ],

    api_contributions: [

        "test-api-stubs-docs-non-updatable.api.contribution",

    ],



    // This module is only used to build android-non-updatable.stubs.test_module_lib

    // and other modules should not depend on this module.

    visibility: [

        "//visibility:private",

    ],

}



java_api_library {

    name: "android_system_server_stubs_current.from-text",

    api_surface: "system-server",