Snap for 9037458 from c4c5f5c7d58aa91c389105dd75e2ce2115def429 to tm-qpr1-release
Change-Id: Ica2ffecb452150a486c55b5bc34fc08311be0df3
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index ec28fd9..05374a8 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "T1004614"
+ build_id: "T1004707"
target: "train_build"
source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.conscrypt/sdk/conscrypt-module-sdk-current.zip"
}
@@ -8,7 +8,7 @@
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/conscrypt"
- git_branch: "master"
+ git_branch: "tm-qpr-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
index 08cfe30..32323c8 100644
--- a/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "T1004614"
+ build_id: "T1004707"
target: "train_build"
source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.conscrypt/host-exports/conscrypt-module-host-exports-current.zip"
}
@@ -8,7 +8,7 @@
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/conscrypt"
- git_branch: "master"
+ git_branch: "tm-qpr-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
index c42f47f..740975f 100644
--- a/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "T1004614"
+ build_id: "T1004707"
target: "train_build"
source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.conscrypt/test-exports/conscrypt-module-test-exports-current.zip"
}
@@ -8,7 +8,7 @@
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/conscrypt"
- git_branch: "master"
+ git_branch: "tm-qpr-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/current/Android.bp b/current/Android.bp
index 3917793..5fe484d 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,16 +1,5 @@
// This is auto-generated. DO NOT EDIT.
-// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
-soong_config_module_type_import {
- from: "packages/modules/common/Android.bp",
- module_types: [
- "module_cc_prebuilt_library_shared",
- "module_java_import",
- "module_java_sdk_library_import",
- "module_prebuilt_bootclasspath_fragment",
- ],
-}
-
package {
// A default list here prevents the license LSC from adding its own list which would
// be unnecessary as every module in the sdk already has its own licenses property.
@@ -18,43 +7,11 @@
}
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.
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "ANDROID",
+ var_name: "module_build_from_source",
},
visibility: ["//external/conscrypt:__subpackages__"],
apex_available: ["com.android.conscrypt"],
@@ -84,33 +41,11 @@
}
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.
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "ANDROID",
+ var_name: "module_build_from_source",
},
visibility: [
"//device:__subpackages__",
@@ -130,55 +65,11 @@
}
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",
- "//libcore",
- "//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.
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "ANDROID",
+ var_name: "module_build_from_source",
},
visibility: [
"//build/soong/java/core-libraries",
@@ -220,35 +111,11 @@
}
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",
- "//libcore/mmodules/core_platform_api",
- "//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.
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "ANDROID",
+ var_name: "module_build_from_source",
},
visibility: [
"//build/soong/java/core-libraries",
@@ -270,34 +137,11 @@
}
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.
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "ANDROID",
+ var_name: "module_build_from_source",
},
visibility: [
"//external/conscrypt",
@@ -318,22 +162,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: [
@@ -349,39 +177,11 @@
}
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.
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "ANDROID",
+ var_name: "module_build_from_source",
},
visibility: ["//external/conscrypt:__subpackages__"],
apex_available: ["//apex_available:platform"],
@@ -404,16 +204,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/arm/lib/libconscrypt_jni.so b/current/arm/lib/libconscrypt_jni.so
index 5e5f2b7..732edf5 100755
--- a/current/arm/lib/libconscrypt_jni.so
+++ b/current/arm/lib/libconscrypt_jni.so
Binary files differ
diff --git a/current/arm64/lib/libconscrypt_jni.so b/current/arm64/lib/libconscrypt_jni.so
index ad90cb4..d3ae331 100755
--- a/current/arm64/lib/libconscrypt_jni.so
+++ b/current/arm64/lib/libconscrypt_jni.so
Binary files differ
diff --git a/current/host-exports/Android.bp b/current/host-exports/Android.bp
index 3ae8f8c..2daa720 100644
--- a/current/host-exports/Android.bp
+++ b/current/host-exports/Android.bp
@@ -1,14 +1,5 @@
// This is auto-generated. DO NOT EDIT.
-// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
-soong_config_module_type_import {
- from: "packages/modules/common/Android.bp",
- module_types: [
- "module_cc_prebuilt_library_shared",
- "module_java_import",
- ],
-}
-
package {
// A default list here prevents the license LSC from adding its own list which would
// be unnecessary as every module in the sdk already has its own licenses property.
@@ -16,35 +7,11 @@
}
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.
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "ANDROID",
+ var_name: "module_build_from_source",
},
visibility: [
"//build/make/tools/signapk",
@@ -66,22 +33,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: [
@@ -97,56 +48,11 @@
}
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.
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "ANDROID",
+ var_name: "module_build_from_source",
},
visibility: [
"//build/make/tools/signapk",
@@ -186,29 +92,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/host-exports/linux_bionic/x86_64/lib/libconscrypt_openjdk_jni.so b/current/host-exports/linux_bionic/x86_64/lib/libconscrypt_openjdk_jni.so
index 797c80e..1b47562 100755
--- a/current/host-exports/linux_bionic/x86_64/lib/libconscrypt_openjdk_jni.so
+++ b/current/host-exports/linux_bionic/x86_64/lib/libconscrypt_openjdk_jni.so
Binary files differ
diff --git a/current/host-exports/linux_glibc/x86/lib/libconscrypt_openjdk_jni.so b/current/host-exports/linux_glibc/x86/lib/libconscrypt_openjdk_jni.so
index 31a5286..4e28ff9 100755
--- a/current/host-exports/linux_glibc/x86/lib/libconscrypt_openjdk_jni.so
+++ b/current/host-exports/linux_glibc/x86/lib/libconscrypt_openjdk_jni.so
Binary files differ
diff --git a/current/host-exports/linux_glibc/x86_64/lib/libconscrypt_openjdk_jni.so b/current/host-exports/linux_glibc/x86_64/lib/libconscrypt_openjdk_jni.so
index 57040af..02d9eb4 100755
--- a/current/host-exports/linux_glibc/x86_64/lib/libconscrypt_openjdk_jni.so
+++ b/current/host-exports/linux_glibc/x86_64/lib/libconscrypt_openjdk_jni.so
Binary files differ
diff --git a/current/host-exports/snapshot-creation-build-number.txt b/current/host-exports/snapshot-creation-build-number.txt
index 012bf4f..0395bdd 100644
--- a/current/host-exports/snapshot-creation-build-number.txt
+++ b/current/host-exports/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8843487
\ No newline at end of file
+8989711
\ No newline at end of file
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 012bf4f..0395bdd 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8843487
\ No newline at end of file
+8989711
\ No newline at end of file
diff --git a/current/test-exports/Android.bp b/current/test-exports/Android.bp
index 5560847..15fe7ba 100644
--- a/current/test-exports/Android.bp
+++ b/current/test-exports/Android.bp
@@ -1,15 +1,5 @@
// This is auto-generated. DO NOT EDIT.
-// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
-soong_config_module_type_import {
- from: "packages/modules/common/Android.bp",
- module_types: [
- "module_cc_prebuilt_library_shared",
- "module_java_import",
- "module_java_test_import",
- ],
-}
-
package {
// A default list here prevents the license LSC from adding its own list which would
// be unnecessary as every module in the sdk already has its own licenses property.
@@ -17,27 +7,11 @@
}
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.
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "ANDROID",
+ var_name: "module_build_from_source",
},
visibility: [
"//art/build",
@@ -51,27 +25,11 @@
}
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.
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "ANDROID",
+ var_name: "module_build_from_source",
},
visibility: [
"//cts/tests/libcore/luni",
@@ -85,22 +43,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: [
@@ -116,69 +58,11 @@
}
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.
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "ANDROID",
+ var_name: "module_build_from_source",
},
visibility: ["//external/conscrypt:__subpackages__"],
apex_available: [
@@ -231,31 +115,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,
- },
- },
-}
diff --git a/current/test-exports/android/arm/lib/libjavacrypto.so b/current/test-exports/android/arm/lib/libjavacrypto.so
index 5db8728..7bc9785 100755
--- a/current/test-exports/android/arm/lib/libjavacrypto.so
+++ b/current/test-exports/android/arm/lib/libjavacrypto.so
Binary files differ
diff --git a/current/test-exports/android/arm64/lib/libjavacrypto.so b/current/test-exports/android/arm64/lib/libjavacrypto.so
index e8ef964..156093a 100755
--- a/current/test-exports/android/arm64/lib/libjavacrypto.so
+++ b/current/test-exports/android/arm64/lib/libjavacrypto.so
Binary files differ
diff --git a/current/test-exports/android/x86/lib/libjavacrypto.so b/current/test-exports/android/x86/lib/libjavacrypto.so
index dfce128..17a2c5e 100755
--- a/current/test-exports/android/x86/lib/libjavacrypto.so
+++ b/current/test-exports/android/x86/lib/libjavacrypto.so
Binary files differ
diff --git a/current/test-exports/android/x86_64/lib/libjavacrypto.so b/current/test-exports/android/x86_64/lib/libjavacrypto.so
index ca38dff..efc10ea 100755
--- a/current/test-exports/android/x86_64/lib/libjavacrypto.so
+++ b/current/test-exports/android/x86_64/lib/libjavacrypto.so
Binary files differ
diff --git a/current/test-exports/linux_bionic/x86_64/lib/libjavacrypto.so b/current/test-exports/linux_bionic/x86_64/lib/libjavacrypto.so
index 8d49823..7235c25 100755
--- a/current/test-exports/linux_bionic/x86_64/lib/libjavacrypto.so
+++ b/current/test-exports/linux_bionic/x86_64/lib/libjavacrypto.so
Binary files differ
diff --git a/current/test-exports/linux_glibc/x86/lib/libjavacrypto.so b/current/test-exports/linux_glibc/x86/lib/libjavacrypto.so
index bd824d9..8b93bec 100755
--- a/current/test-exports/linux_glibc/x86/lib/libjavacrypto.so
+++ b/current/test-exports/linux_glibc/x86/lib/libjavacrypto.so
Binary files differ
diff --git a/current/test-exports/linux_glibc/x86_64/lib/libjavacrypto.so b/current/test-exports/linux_glibc/x86_64/lib/libjavacrypto.so
index 95e911e..a6c2a06 100755
--- a/current/test-exports/linux_glibc/x86_64/lib/libjavacrypto.so
+++ b/current/test-exports/linux_glibc/x86_64/lib/libjavacrypto.so
Binary files differ
diff --git a/current/test-exports/snapshot-creation-build-number.txt b/current/test-exports/snapshot-creation-build-number.txt
index 012bf4f..0395bdd 100644
--- a/current/test-exports/snapshot-creation-build-number.txt
+++ b/current/test-exports/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8843487
\ No newline at end of file
+8989711
\ No newline at end of file
diff --git a/current/x86/lib/libconscrypt_jni.so b/current/x86/lib/libconscrypt_jni.so
index c500523..420773b 100755
--- a/current/x86/lib/libconscrypt_jni.so
+++ b/current/x86/lib/libconscrypt_jni.so
Binary files differ
diff --git a/current/x86_64/lib/libconscrypt_jni.so b/current/x86_64/lib/libconscrypt_jni.so
index 1a9e3c1..351241d 100755
--- a/current/x86_64/lib/libconscrypt_jni.so
+++ b/current/x86_64/lib/libconscrypt_jni.so
Binary files differ
