Remove current versioned snapshot
Versioned snapshots are no longer generated for, or used by, Soong
which means that having a versioned snapshot in an Android.bp file
processed by Soong is just a waste of resources and prevents all the
support for versioned snapshots from being removed from Soong.
This change removes the @current versioned instances of the modules
from the sdk snapshots.
Merged-In specifies the id of a downstream change that updated the
module sdk snapshot with one which does not contain @current
versioned modules and so does not need to have this change applied.
Bug: 260237150
Test: m nothing
Merged-In: I642f7407c0bbeab8bcc48cedeae64915b416dcfc
Change-Id: I99d6d58aad2e30dda0a5311143b2ce71061258bf
diff --git a/current/Android.bp b/current/Android.bp
index 77caee5..98810cc 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -17,36 +17,6 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-prebuilt_bootclasspath_fragment {
- name: "conscrypt-module-sdk_com.android.conscrypt-bootclasspath-fragment@current",
- sdk_member_name: "com.android.conscrypt-bootclasspath-fragment",
- visibility: ["//external/conscrypt:__subpackages__"],
- apex_available: ["com.android.conscrypt"],
- licenses: ["conscrypt-module-sdk_external_conscrypt_license@current"],
- contents: ["conscrypt-module-sdk_conscrypt@current"],
- fragments: [
- {
- apex: "com.android.art",
- module: "art-bootclasspath-fragment",
- },
- ],
- api: {
- stub_libs: ["conscrypt-module-sdk_conscrypt.module.public.api@current"],
- },
- core_platform_api: {
- stub_libs: ["conscrypt-module-sdk_conscrypt.module.platform.api@current"],
- },
- hidden_api: {
- max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
- annotation_flags: "hiddenapi/annotation-flags.csv",
- metadata: "hiddenapi/metadata.csv",
- index: "hiddenapi/index.csv",
- signature_patterns: "hiddenapi/signature-patterns.csv",
- filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
- filtered_flags: "hiddenapi/filtered-flags.csv",
- },
-}
-
module_prebuilt_bootclasspath_fragment {
name: "com.android.conscrypt-bootclasspath-fragment",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -83,26 +53,6 @@
},
}
-java_import {
- name: "conscrypt-module-sdk_conscrypt@current",
- sdk_member_name: "conscrypt",
- visibility: [
- "//device:__subpackages__",
- "//external/conscrypt:__subpackages__",
- "//system/apex/tests",
- ],
- apex_available: [
- "com.android.conscrypt",
- "test_com.android.conscrypt",
- ],
- licenses: ["conscrypt-module-sdk_external_conscrypt_license@current"],
- jars: ["java_boot_libs/snapshot/jars/are/invalid/conscrypt.jar"],
- permitted_packages: [
- "android.net.ssl",
- "com.android.org.conscrypt",
- ],
-}
-
module_java_import {
name: "conscrypt",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -129,47 +79,6 @@
],
}
-java_sdk_library_import {
- name: "conscrypt-module-sdk_conscrypt.module.public.api@current",
- sdk_member_name: "conscrypt.module.public.api",
- visibility: [
- "//build/soong/java/core-libraries",
- "//external/conscrypt",
- "//frameworks/base",
- "//frameworks/base/api",
- "//packages/modules/IPsec",
- "//packages/modules/common/sdk",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["conscrypt-module-sdk_external_conscrypt_license@current"],
- shared_library: false,
- public: {
- jars: ["sdk_library/public/conscrypt.module.public.api-stubs.jar"],
- stub_srcs: ["sdk_library/public/conscrypt.module.public.api.srcjar"],
- current_api: "sdk_library/public/conscrypt.module.public.api.txt",
- removed_api: "sdk_library/public/conscrypt.module.public.api-removed.txt",
- annotations: "sdk_library/public/conscrypt.module.public.api_annotations.zip",
- sdk_version: "none",
- },
- system: {
- jars: ["sdk_library/system/conscrypt.module.public.api-stubs.jar"],
- stub_srcs: ["sdk_library/system/conscrypt.module.public.api.srcjar"],
- current_api: "sdk_library/system/conscrypt.module.public.api.txt",
- removed_api: "sdk_library/system/conscrypt.module.public.api-removed.txt",
- annotations: "sdk_library/system/conscrypt.module.public.api_annotations.zip",
- sdk_version: "none",
- },
- module_lib: {
- jars: ["sdk_library/module-lib/conscrypt.module.public.api-stubs.jar"],
- stub_srcs: ["sdk_library/module-lib/conscrypt.module.public.api.srcjar"],
- current_api: "sdk_library/module-lib/conscrypt.module.public.api.txt",
- removed_api: "sdk_library/module-lib/conscrypt.module.public.api-removed.txt",
- annotations: "sdk_library/module-lib/conscrypt.module.public.api_annotations.zip",
- sdk_version: "none",
- },
-}
-
module_java_sdk_library_import {
name: "conscrypt.module.public.api",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -217,27 +126,6 @@
},
}
-java_sdk_library_import {
- name: "conscrypt-module-sdk_conscrypt.module.platform.api@current",
- sdk_member_name: "conscrypt.module.platform.api",
- visibility: [
- "//build/soong/java/core-libraries",
- "//external/conscrypt",
- "//external/wycheproof",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["conscrypt-module-sdk_external_conscrypt_license@current"],
- shared_library: false,
- public: {
- jars: ["sdk_library/public/conscrypt.module.platform.api-stubs.jar"],
- stub_srcs: ["sdk_library/public/conscrypt.module.platform.api.srcjar"],
- current_api: "sdk_library/public/conscrypt.module.platform.api.txt",
- removed_api: "sdk_library/public/conscrypt.module.platform.api-removed.txt",
- sdk_version: "none",
- },
-}
-
module_java_sdk_library_import {
name: "conscrypt.module.platform.api",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -265,27 +153,6 @@
},
}
-java_sdk_library_import {
- name: "conscrypt-module-sdk_conscrypt.module.intra.core.api@current",
- sdk_member_name: "conscrypt.module.intra.core.api",
- visibility: [
- "//external/conscrypt",
- "//external/okhttp",
- "//libcore:__subpackages__",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["conscrypt-module-sdk_external_conscrypt_license@current"],
- shared_library: false,
- public: {
- jars: ["sdk_library/public/conscrypt.module.intra.core.api-stubs.jar"],
- stub_srcs: ["sdk_library/public/conscrypt.module.intra.core.api.srcjar"],
- current_api: "sdk_library/public/conscrypt.module.intra.core.api.txt",
- removed_api: "sdk_library/public/conscrypt.module.intra.core.api-removed.txt",
- sdk_version: "none",
- },
-}
-
module_java_sdk_library_import {
name: "conscrypt.module.intra.core.api",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -314,22 +181,6 @@
}
license {
- name: "conscrypt-module-sdk_external_conscrypt_license@current",
- sdk_member_name: "external_conscrypt_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "legacy_unencumbered",
- ],
- license_text: [
- "licenses/external/conscrypt/LICENSE",
- "licenses/external/conscrypt/NOTICE",
- "licenses/external/conscrypt/licenses/LICENSE.harmony.txt",
- "licenses/external/conscrypt/licenses/LICENSE.netty.txt",
- ],
-}
-
-license {
name: "conscrypt-module-sdk_external_conscrypt_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -344,32 +195,6 @@
],
}
-cc_prebuilt_library_shared {
- name: "conscrypt-module-sdk_libconscrypt_jni@current",
- sdk_member_name: "libconscrypt_jni",
- visibility: ["//external/conscrypt:__subpackages__"],
- apex_available: ["//apex_available:platform"],
- licenses: ["conscrypt-module-sdk_external_conscrypt_license@current"],
- installable: false,
- stl: "c++_static",
- compile_multilib: "both",
- shared_libs: ["liblog"],
- arch: {
- arm64: {
- srcs: ["arm64/lib/libconscrypt_jni.so"],
- },
- x86_64: {
- srcs: ["x86_64/lib/libconscrypt_jni.so"],
- },
- arm: {
- srcs: ["arm/lib/libconscrypt_jni.so"],
- },
- x86: {
- srcs: ["x86/lib/libconscrypt_jni.so"],
- },
- },
-}
-
module_cc_prebuilt_library_shared {
name: "libconscrypt_jni",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -400,16 +225,3 @@
},
},
}
-
-sdk_snapshot {
- name: "conscrypt-module-sdk@current",
- visibility: ["//external/conscrypt:__subpackages__"],
- bootclasspath_fragments: ["conscrypt-module-sdk_com.android.conscrypt-bootclasspath-fragment@current"],
- java_boot_libs: ["conscrypt-module-sdk_conscrypt@current"],
- java_sdk_libs: [
- "conscrypt-module-sdk_conscrypt.module.public.api@current",
- "conscrypt-module-sdk_conscrypt.module.platform.api@current",
- "conscrypt-module-sdk_conscrypt.module.intra.core.api@current",
- ],
- native_shared_libs: ["conscrypt-module-sdk_libconscrypt_jni@current"],
-}
diff --git a/current/host-exports/Android.bp b/current/host-exports/Android.bp
index 3ae8f8c..627c5ae 100644
--- a/current/host-exports/Android.bp
+++ b/current/host-exports/Android.bp
@@ -15,28 +15,6 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-java_import {
- name: "conscrypt-module-host-exports_conscrypt-unbundled@current",
- sdk_member_name: "conscrypt-unbundled",
- visibility: [
- "//build/make/tools/signapk",
- "//external/conscrypt",
- "//tools/apksig",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["conscrypt-module-host-exports_external_conscrypt_license@current"],
- device_supported: false,
- host_supported: true,
- target: {
- linux_bionic: {
- jars: ["java/linux_bionic/conscrypt-unbundled.jar"],
- },
- linux_glibc: {
- jars: ["java/linux_glibc/conscrypt-unbundled.jar"],
- },
- },
-}
-
module_java_import {
name: "conscrypt-unbundled",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -66,22 +44,6 @@
}
license {
- name: "conscrypt-module-host-exports_external_conscrypt_license@current",
- sdk_member_name: "external_conscrypt_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "legacy_unencumbered",
- ],
- license_text: [
- "licenses/external/conscrypt/LICENSE",
- "licenses/external/conscrypt/NOTICE",
- "licenses/external/conscrypt/licenses/LICENSE.harmony.txt",
- "licenses/external/conscrypt/licenses/LICENSE.netty.txt",
- ],
-}
-
-license {
name: "conscrypt-module-host-exports_external_conscrypt_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -96,49 +58,6 @@
],
}
-cc_prebuilt_library_shared {
- name: "conscrypt-module-host-exports_libconscrypt_openjdk_jni@current",
- sdk_member_name: "libconscrypt_openjdk_jni",
- visibility: [
- "//build/make/tools/signapk",
- "//external/conscrypt",
- "//tools/apksig",
- "//vendor:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["conscrypt-module-host-exports_external_conscrypt_license@current"],
- device_supported: false,
- host_supported: true,
- installable: false,
- stl: "libc++_static",
- sanitize: {
- never: true,
- },
- target: {
- host: {
- enabled: false,
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["linux_bionic/x86_64/lib/libconscrypt_openjdk_jni.so"],
- },
- linux_glibc: {
- compile_multilib: "both",
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/lib/libconscrypt_openjdk_jni.so"],
- },
- linux_glibc_x86: {
- enabled: true,
- srcs: ["linux_glibc/x86/lib/libconscrypt_openjdk_jni.so"],
- },
- },
-}
-
module_cc_prebuilt_library_shared {
name: "libconscrypt_openjdk_jni",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -186,29 +105,3 @@
},
},
}
-
-module_exports_snapshot {
- name: "conscrypt-module-host-exports@current",
- visibility: ["//external/conscrypt:__subpackages__"],
- device_supported: false,
- host_supported: true,
- java_libs: ["conscrypt-module-host-exports_conscrypt-unbundled@current"],
- native_shared_libs: ["conscrypt-module-host-exports_libconscrypt_openjdk_jni@current"],
- target: {
- linux_bionic: {
- compile_multilib: "64",
- },
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- },
- linux_glibc_x86: {
- enabled: true,
- },
- linux_bionic_x86_64: {
- enabled: true,
- },
- },
-}
diff --git a/current/test-exports/Android.bp b/current/test-exports/Android.bp
index 5560847..6258aeb 100644
--- a/current/test-exports/Android.bp
+++ b/current/test-exports/Android.bp
@@ -16,20 +16,6 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-java_import {
- name: "conscrypt-module-test-exports_conscrypt-for-host@current",
- sdk_member_name: "conscrypt-for-host",
- visibility: [
- "//art/build",
- "//external/conscrypt",
- "//external/robolectric-shadows",
- "//frameworks/layoutlib",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["conscrypt-module-test-exports_external_conscrypt_license@current"],
- jars: ["java/conscrypt-for-host.jar"],
-}
-
module_java_import {
name: "conscrypt-for-host",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -50,20 +36,6 @@
jars: ["java/conscrypt-for-host.jar"],
}
-java_test_import {
- name: "conscrypt-module-test-exports_conscrypt-tests@current",
- sdk_member_name: "conscrypt-tests",
- visibility: [
- "//cts/tests/libcore/luni",
- "//external/conscrypt",
- "//external/conscrypt/apex/tests",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["conscrypt-module-test-exports_external_conscrypt_license@current"],
- jars: ["java/conscrypt-tests.jar"],
- test_config: "java/conscrypt-tests-AndroidTest.xml",
-}
-
module_java_test_import {
name: "conscrypt-tests",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -85,22 +57,6 @@
}
license {
- name: "conscrypt-module-test-exports_external_conscrypt_license@current",
- sdk_member_name: "external_conscrypt_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "legacy_unencumbered",
- ],
- license_text: [
- "licenses/external/conscrypt/LICENSE",
- "licenses/external/conscrypt/NOTICE",
- "licenses/external/conscrypt/licenses/LICENSE.harmony.txt",
- "licenses/external/conscrypt/licenses/LICENSE.netty.txt",
- ],
-}
-
-license {
name: "conscrypt-module-test-exports_external_conscrypt_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -115,62 +71,6 @@
],
}
-cc_prebuilt_library_shared {
- name: "conscrypt-module-test-exports_libjavacrypto@current",
- sdk_member_name: "libjavacrypto",
- visibility: ["//external/conscrypt:__subpackages__"],
- apex_available: [
- "com.android.conscrypt",
- "test_com.android.conscrypt",
- ],
- licenses: ["conscrypt-module-test-exports_external_conscrypt_license@current"],
- host_supported: true,
- installable: false,
- shared_libs: [
- "libcrypto",
- "liblog",
- "libssl",
- ],
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libjavacrypto.so"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libjavacrypto.so"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libjavacrypto.so"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libjavacrypto.so"],
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["linux_bionic/x86_64/lib/libjavacrypto.so"],
- },
- linux_glibc: {
- compile_multilib: "both",
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/lib/libjavacrypto.so"],
- },
- linux_glibc_x86: {
- enabled: true,
- srcs: ["linux_glibc/x86/lib/libjavacrypto.so"],
- },
- },
-}
-
module_cc_prebuilt_library_shared {
name: "libjavacrypto",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -231,31 +131,3 @@
},
},
}
-
-module_exports_snapshot {
- name: "conscrypt-module-test-exports@current",
- visibility: ["//external/conscrypt:__subpackages__"],
- host_supported: true,
- native_shared_libs: ["conscrypt-module-test-exports_libjavacrypto@current"],
- target: {
- android: {
- java_libs: ["conscrypt-module-test-exports_conscrypt-for-host@current"],
- java_tests: ["conscrypt-module-test-exports_conscrypt-tests@current"],
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- },
- linux_glibc_x86: {
- enabled: true,
- },
- linux_bionic_x86_64: {
- enabled: true,
- },
- },
-}
