Snap for 8857176 from a0675a03e03385472bf1133edd5e52131053588d to mainline-go-adbd-release
Change-Id: I45783b09ea44177ff3f91835a2f876f44f2bc9b8
diff --git a/Android.bp b/Android.bp
index b0d7754..cb98854 100644
--- a/Android.bp
+++ b/Android.bp
@@ -335,6 +335,10 @@
// TODO(b/155921753): Restrict this when prebuilts are in their proper
// locations.
"//prebuilts:__subpackages__",
+
+ // DO NOT REMOVE: Legacy visibility, needed for snapshots that are
+ // generated for the S build.
+ "//libcore/mmodules/core_platform_api",
],
srcs: [
":conscrypt_java_files",
@@ -374,6 +378,10 @@
// TODO(b/155921753): Restrict this when prebuilts are in their proper
// locations.
"//prebuilts:__subpackages__",
+
+ // DO NOT REMOVE: Legacy visibility, needed for snapshots that are
+ // generated for the S build.
+ "//libcore",
],
srcs: [
":conscrypt_public_api_files",
@@ -654,13 +662,13 @@
// Device SDK exposed by the Conscrypt module.
sdk {
name: "conscrypt-module-sdk",
- bootclasspath_fragments: [
- "com.android.conscrypt-bootclasspath-fragment",
+ apexes: [
+ // Adds exportable dependencies of the APEX to the sdk,
+ // e.g. *classpath_fragments.
+ "com.android.conscrypt",
],
java_sdk_libs: [
- "conscrypt.module.public.api",
"conscrypt.module.intra.core.api",
- "conscrypt.module.platform.api",
],
native_shared_libs: [
"libconscrypt_jni",
diff --git a/apex/Android.bp b/apex/Android.bp
index f20ea90..86e48f9 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -76,6 +76,7 @@
apex {
name: "com.android.conscrypt",
visibility: [
+ "//external/conscrypt",
"//vendor:__subpackages__",
],
defaults: ["com.android.conscrypt-defaults"],
