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

Commit 1731cd2d authored by Mark Chien's avatar Mark Chien Committed by Automerger Merge Worker
Browse files

Merge "Compile android-non-updatable with framework-tethering module-lib stub"... 

Merge "Compile android-non-updatable with framework-tethering module-lib stub" am: 1176dd44 am: 9a542a97 am: e95587d1 am: e2e27a80

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

Change-Id: I98d51b1595bed95f181f903781dacabaa90c0d00
parents 044ccaf3 e2e27a80

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -571,6 +571,7 @@ stubs_defaults { 
        "android.hardware.vibrator-V1.3-java",

        "framework-protos",

        "art.module.public.api",

        "sdk_module-lib_current_framework-tethering",

        // There are a few classes from modules used by the core that

        // need to be resolved by metalava. We use a prebuilt stub of the

        // full sdk to ensure we can resolve them. If a new class gets added,

StubLibraries.bp

+1 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ java_library { 
    defaults: ["android-non-updatable_defaults_stubs_current"],

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

    libs: [

        "sdk_module-lib_current_framework-tethering",

        "sdk_system_current_android",

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

        "sdk_system_current_android.net.ipsec.ike",