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

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

Merge "Clean up prebuilt stub deps & add comment" into main am: e1d899f2 am:... 

Merge "Clean up prebuilt stub deps & add comment" into main am: e1d899f2 am: b6bb6b70 am: b45e69de am: 00858e6d

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



Change-Id: I3fea9aa025f51bee9b666c910ae37a78c089c508
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c635c722 00858e6d

api/StubLibraries.bp

+6 −4
Original line number Diff line number Diff line
@@ -357,13 +357,15 @@ java_library { 
    ],

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

    libs: [

        // We cannot depend on all-modules-module-lib-stubs, because the module-lib stubs

        // depend on this stub. We resolve dependencies on APIs in modules by depending

        // on a prebuilt of the whole platform (sdk_system_current_android).

        // That prebuilt does not include module-lib APIs, so use the prebuilt module-lib

        // stubs for modules that export module-lib stubs that the non-updatable part

        // depends on.

        "sdk_module-lib_current_framework-tethering",

        "sdk_module-lib_current_framework-connectivity-t",

        "sdk_public_current_framework-bluetooth",

        // NOTE: The below can be removed once the prebuilt stub contains bluetooth.

        "sdk_system_current_android",

        // NOTE: The below can be removed once the prebuilt stub contains IKE.

        "sdk_system_current_android.net.ipsec.ike",

    ],

    dist: {

        dir: "apistubs/android/module-lib",