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

Commit 283575b3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use tags to access conscrypt sources" am: 5b097180 am: 5179aa14 am:... 

Merge "Use tags to access conscrypt sources" am: 5b097180 am: 5179aa14 am: 66443ee4 am: 876b0da4 am: 2959621b

Change-Id: If39af0123c9f0c467ddc51f7826540e80fd27969
parents e77a3d0d 2959621b

ApiDocs.bp

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ stubs_defaults { 
        ":opt-telephony-srcs",

        ":opt-net-voip-srcs",

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

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

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

        ":android_icu4j_public_api_files",

        "test-mock/src/**/*.java",

        "test-runner/src/**/*.java",

StubLibraries.bp

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ stubs_defaults { 
    name: "metalava-full-api-stubs-default",

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

    srcs: [

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

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

        ":framework-updatable-sources",

    ],

    sdk_version: "core_platform",