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

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

Merge "Temporarily add IKE to non-updatable stubs build" am: 6869137d am:... 

Merge "Temporarily add IKE to non-updatable stubs build" am: 6869137d am: ddd98663 am: e3134523

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2ef8f60d78bbf1d855bfb487d7e040c7c06145d
parents e787af13 e3134523

StubLibraries.bp

+7 −1
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ stubs_defaults { 
        // full sdk to ensure we can resolve them. If a new class gets added,

        // the prebuilts/sdk/current needs to be updated.

        "sdk_system_current_android",

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

        "sdk_system_current_android.net.ipsec.ike",

    ],

    high_mem: true, // Lots of sources => high memory use, see b/170701554

    installable: false,
@@ -403,7 +405,11 @@ java_library_static { 
        "android_defaults_stubs_current",

        "android_stubs_dists_default",

    ],

    libs: ["sdk_system_current_android"],

    libs: [

        "sdk_system_current_android",

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

        "sdk_system_current_android.net.ipsec.ike",

    ],

    static_libs: ["art.module.public.api.stubs"],

    dist: {

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