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

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

Merge "Move conscrypt from the set of non-updatable APIs" into rvc-dev am: 4963e51f 

Change-Id: I357c3a312ecae5470703914ee237305068a0d56f
parents 5620ca2c 4963e51f

StubLibraries.bp

+4 −2
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ stubs_defaults { 
        ":opt-telephony-srcs",

        ":opt-net-voip-srcs",

        ":art-module-public-api-stubs-source",

        ":conscrypt.module.public.api.stubs.source",

        ":android_icu4j_public_api_files",

    ],

    // TODO(b/147699819): remove below aidl includes.
@@ -69,7 +68,10 @@ stubs_defaults { 
stubs_defaults {

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

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

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

    srcs: [

        ":conscrypt.module.public.api.stubs.source",

        ":framework-updatable-sources",

    ],

    sdk_version: "core_platform",

}