From ef9be67c2f85bdd2db80b10677f743f4070c6d5e Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 8 Jun 2021 16:56:05 +0100
Subject: [PATCH] Add conscrypt module to sdk extensions

Add visibility of the sdkinfo proto, as well as an enum for the module
to be used by SdkExtensions.

Bug: 188787081
Test: m com.android.conscrypt and inspect it
Change-Id: If8655c3328597580408a87e4c6dc4f92547a57e9
---
 proto/sdk.proto  | 1 +
 tools/Android.bp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/proto/sdk.proto b/proto/sdk.proto
index 1d9afcb..4fddf8d 100644
--- a/proto/sdk.proto
+++ b/proto/sdk.proto
@@ -26,6 +26,7 @@ enum SdkModule {
   UNKNOWN = 0;
 
   // R modules
+  CONSCRYPT = 10;
   IPSEC = 1;
   MEDIA = 2;
   MEDIA_PROVIDER = 3;
diff --git a/tools/Android.bp b/tools/Android.bp
index c26ed17..ed5423e 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -59,6 +59,7 @@ prebuilt_etc {
     installable: false,
     visibility: [
         "//art:__subpackages__",
+        "//external/conscrypt:__subpackages__",
         "//frameworks/av/apex:__subpackages__",
         "//packages/modules/Connectivity:__subpackages__",
         "//packages/modules/IPsec/apex:__subpackages__",