diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-21 20:21:29 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-21 20:21:29 +0000 |
| commit | 1fea586de8156698efe5da469ba7ba6fe56478ca (patch) | |
| tree | d11f38178969e59fce5028b5170b065f43f6a7be | |
| parent | 4f7f293d3dcd315097c8d94e6a830df680992330 (diff) | |
| parent | a0675a03e03385472bf1133edd5e52131053588d (diff) | |
| download | conscrypt-android13-mainline-go-networking-release.tar.gz | |
Snap for 8857176 from a0675a03e03385472bf1133edd5e52131053588d to mainline-go-networking-releaseaml_go_net_330913000android13-mainline-go-networking-release
Change-Id: I87f69d2c5eb75295cf238d07518e493a64cc41a5
| -rw-r--r-- | Android.bp | 16 | ||||
| -rw-r--r-- | apex/Android.bp | 1 |
2 files changed, 13 insertions, 4 deletions
@@ -335,6 +335,10 @@ java_sdk_library { // 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 @@ java_sdk_library { // 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 @@ java_test { // 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 f20ea90f..86e48f9d 100644 --- a/apex/Android.bp +++ b/apex/Android.bp @@ -76,6 +76,7 @@ prebuilt_etc { apex { name: "com.android.conscrypt", visibility: [ + "//external/conscrypt", "//vendor:__subpackages__", ], defaults: ["com.android.conscrypt-defaults"], |