[automerger skipped] DO NOT MERGE Update Android.bp am: 0ce0f77e0a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/15371873
Change-Id: Ia9fe1b0b79d57cd055ef64404c893a9df6d1ba94
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 277c2d1..05348fe 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: "7570495"
+ build_id: "7542407"
target: "mainline_modules-user"
source_file: "mainline-sdks/conscrypt-module-sdk-current.zip"
}
@@ -10,10 +10,4 @@
git_project: "platform/prebuilts/module_sdk/conscrypt"
git_branch: "sc-dev"
transform: TRANSFORM_UNZIP
- transform_options {
- rename {
- from_path: "Android.bp"
- to_path: "Android.bp.auto"
- }
- }
}
diff --git a/current/Android.bp b/current/Android.bp
index 04c1eae..4459fe5 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -6,16 +6,6 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-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",
- ],
-}
-
prebuilt_bootclasspath_fragment {
name: "conscrypt-module-sdk_com.android.conscrypt-bootclasspath-fragment@current",
sdk_member_name: "com.android.conscrypt-bootclasspath-fragment",
@@ -39,14 +29,9 @@
},
}
-module_prebuilt_bootclasspath_fragment {
+prebuilt_bootclasspath_fragment {
name: "com.android.conscrypt-bootclasspath-fragment",
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
- },
+ prefer: false,
visibility: ["//external/conscrypt:__subpackages__"],
apex_available: ["com.android.conscrypt"],
licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
@@ -81,20 +66,11 @@
],
licenses: ["conscrypt-module-sdk_external_conscrypt_license@current"],
jars: ["java/conscrypt.jar"],
- permitted_packages: [
- "android.net.ssl",
- "com.android.org.conscrypt",
- ],
}
-module_java_import {
+java_import {
name: "conscrypt",
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
- },
+ prefer: false,
visibility: [
"//device:__subpackages__",
"//external/conscrypt:__subpackages__",
@@ -106,10 +82,6 @@
],
licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
jars: ["java/conscrypt.jar"],
- permitted_packages: [
- "android.net.ssl",
- "com.android.org.conscrypt",
- ],
}
java_sdk_library_import {
@@ -136,14 +108,9 @@
},
}
-module_java_sdk_library_import {
+java_sdk_library_import {
name: "conscrypt.module.public.api",
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
- },
+ prefer: false,
visibility: [
"//external/conscrypt",
"//frameworks/base",
@@ -186,14 +153,9 @@
},
}
-module_java_sdk_library_import {
+java_sdk_library_import {
name: "conscrypt.module.platform.api",
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
- },
+ prefer: false,
visibility: [
"//external/conscrypt",
"//external/wycheproof",
@@ -233,14 +195,9 @@
},
}
-module_java_sdk_library_import {
+java_sdk_library_import {
name: "conscrypt.module.intra.core.api",
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
- },
+ prefer: false,
visibility: [
"//external/conscrypt",
"//external/okhttp",
@@ -316,14 +273,9 @@
},
}
-module_cc_prebuilt_library_shared {
+cc_prebuilt_library_shared {
name: "libconscrypt_jni",
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
- },
+ prefer: false,
visibility: ["//external/conscrypt:__subpackages__"],
apex_available: ["//apex_available:platform"],
licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
diff --git a/current/Android.bp.auto b/current/Android.bp.auto
deleted file mode 100644
index e30bad5..0000000
--- a/current/Android.bp.auto
+++ /dev/null
@@ -1,320 +0,0 @@
-// This is auto-generated. DO NOT EDIT.
-
-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.
- 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"],
- 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"],
- stub_flags: "hiddenapi/stub-flags.csv",
- annotation_flags: "hiddenapi/annotation-flags.csv",
- metadata: "hiddenapi/metadata.csv",
- index: "hiddenapi/index.csv",
- all_flags: "hiddenapi/all-flags.csv",
- },
-}
-
-prebuilt_bootclasspath_fragment {
- name: "com.android.conscrypt-bootclasspath-fragment",
- prefer: false,
- visibility: ["//external/conscrypt:__subpackages__"],
- apex_available: ["com.android.conscrypt"],
- licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
- contents: ["conscrypt"],
- api: {
- stub_libs: ["conscrypt.module.public.api"],
- },
- core_platform_api: {
- stub_libs: ["conscrypt.module.platform.api"],
- },
- hidden_api: {
- max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
- stub_flags: "hiddenapi/stub-flags.csv",
- annotation_flags: "hiddenapi/annotation-flags.csv",
- metadata: "hiddenapi/metadata.csv",
- index: "hiddenapi/index.csv",
- all_flags: "hiddenapi/all-flags.csv",
- },
-}
-
-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/conscrypt.jar"],
- permitted_packages: [
- "android.net.ssl",
- "com.android.org.conscrypt",
- ],
-}
-
-java_import {
- name: "conscrypt",
- prefer: false,
- 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"],
- jars: ["java/conscrypt.jar"],
- permitted_packages: [
- "android.net.ssl",
- "com.android.org.conscrypt",
- ],
-}
-
-java_sdk_library_import {
- name: "conscrypt-module-sdk_conscrypt.module.public.api@current",
- sdk_member_name: "conscrypt.module.public.api",
- visibility: [
- "//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",
- sdk_version: "none",
- },
-}
-
-java_sdk_library_import {
- name: "conscrypt.module.public.api",
- prefer: false,
- visibility: [
- "//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"],
- 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",
- sdk_version: "none",
- },
-}
-
-java_sdk_library_import {
- name: "conscrypt-module-sdk_conscrypt.module.platform.api@current",
- sdk_member_name: "conscrypt.module.platform.api",
- visibility: [
- "//external/conscrypt",
- "//external/wycheproof",
- "//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.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",
- },
-}
-
-java_sdk_library_import {
- name: "conscrypt.module.platform.api",
- prefer: false,
- visibility: [
- "//external/conscrypt",
- "//external/wycheproof",
- "//libcore:__subpackages__",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
- 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",
- },
-}
-
-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",
- },
-}
-
-java_sdk_library_import {
- name: "conscrypt.module.intra.core.api",
- prefer: false,
- visibility: [
- "//external/conscrypt",
- "//external/okhttp",
- "//libcore:__subpackages__",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
- 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",
- },
-}
-
-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: [
- "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",
- ],
-}
-
-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"],
- },
- },
-}
-
-cc_prebuilt_library_shared {
- name: "libconscrypt_jni",
- prefer: false,
- visibility: ["//external/conscrypt:__subpackages__"],
- apex_available: ["//apex_available:platform"],
- licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
- 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"],
- },
- },
-}
-
-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"],
-}