From e01390cbc6d505517094e04e1752f5499956e527 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 7 May 2020 12:06:00 +0100
Subject: [PATCH] Move conscrypt from the set of non-updatable APIs

This has no practical effect in this CL, but in a future CL we are
changing the stub jars to be assembled by merging other jar files, at
which point we want to conscrypt to not be in the non-updatable jar.

Bug: 144149403
Test: m
Change-Id: Iacfcc3a789cb42a73cc4b4c89a215db0ea09800f
Merged-In: Iacfcc3a789cb42a73cc4b4c89a215db0ea09800f
(cherry picked from commit e89d37d6d88de0cd3ca2fdbcd5648bb0f4c7310f)
---
 StubLibraries.bp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/StubLibraries.bp b/StubLibraries.bp
index 097fb74278702..4a77463160f64 100644
--- 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",
     ],
     libs: ["framework-internal-utils"],
@@ -65,7 +64,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",
 }