Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move conscrypt from the set of non-updatable APIs" into rvc-dev

Browse Source
This commit is contained in:
Anton Hansson
2020-05-07 13:16:56 +00:00
committed by Android (Google) Code Review
parent 42a51b0933 e89d37d6d8
commit 4963e51f97
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
StubLibraries.bp
View File

@@ -48,7 +48,6 @@ stubs_defaults {
":opt-telephony-srcs", ":opt-telephony-srcs",
":opt-net-voip-srcs", ":opt-net-voip-srcs",
":art-module-public-api-stubs-source", ":art-module-public-api-stubs-source",
":conscrypt.module.public.api.stubs.source",
":android_icu4j_public_api_files", ":android_icu4j_public_api_files",
], ],
// TODO(b/147699819): remove below aidl includes. // TODO(b/147699819): remove below aidl includes.
@@ -69,7 +68,10 @@ stubs_defaults {
stubs_defaults { stubs_defaults {
name: "metalava-full-api-stubs-default", name: "metalava-full-api-stubs-default",
defaults: ["metalava-base-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", sdk_version: "core_platform",
} }