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

Change-Id: I4d122f66997f141ef543aa13c3890a918ba67312
2020-05-07 13:38:23 +00:00
parent feef4f872b 297ac99344
commit 7207b470e3
1 changed files with 4 additions and 2 deletions
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -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",
 }