Merge "Drop prebuilt files to android source tree."
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
new file mode 100644
index 0000000..412a8d3
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -0,0 +1,13 @@
+drops {
+ android_build_drop {
+ build_id: "7481421"
+ target: "mainline_modules-user"
+ source_file: "mainline-sdks/conscrypt-module-sdk-current.zip"
+ }
+ dest_file: "current/current.zip"
+ version: ""
+ version_group: ""
+ git_project: "platform/prebuilts/module_sdk/conscrypt"
+ git_branch: "sc-dev"
+ transform: TRANSFORM_UNZIP
+}
diff --git a/current/Android.bp b/current/Android.bp
old mode 100755
new mode 100644
index 101fc95..4459fe5
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -101,7 +101,7 @@
shared_library: false,
public: {
jars: ["sdk_library/public/conscrypt.module.public.api-stubs.jar"],
- stub_srcs: ["sdk_library/public/conscrypt.module.public.api_stub_sources"],
+ 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",
@@ -125,7 +125,7 @@
shared_library: false,
public: {
jars: ["sdk_library/public/conscrypt.module.public.api-stubs.jar"],
- stub_srcs: ["sdk_library/public/conscrypt.module.public.api_stub_sources"],
+ 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",
@@ -146,7 +146,7 @@
shared_library: false,
public: {
jars: ["sdk_library/public/conscrypt.module.platform.api-stubs.jar"],
- stub_srcs: ["sdk_library/public/conscrypt.module.platform.api_stub_sources"],
+ 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",
@@ -167,7 +167,7 @@
shared_library: false,
public: {
jars: ["sdk_library/public/conscrypt.module.platform.api-stubs.jar"],
- stub_srcs: ["sdk_library/public/conscrypt.module.platform.api_stub_sources"],
+ 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",
@@ -188,7 +188,7 @@
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_stub_sources"],
+ 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",
@@ -209,7 +209,7 @@
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_stub_sources"],
+ 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",
diff --git a/current/arm/lib/libconscrypt_jni.so b/current/arm/lib/libconscrypt_jni.so
old mode 100755
new mode 100644
index dd13d3d..3be751c
--- 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
old mode 100755
new mode 100644
index 4edb894..ac32585
--- a/current/arm64/lib/libconscrypt_jni.so
+++ b/current/arm64/lib/libconscrypt_jni.so
Binary files differ
diff --git a/current/sdk_library/public/conscrypt.module.intra.core.api.srcjar b/current/sdk_library/public/conscrypt.module.intra.core.api.srcjar
new file mode 100644
index 0000000..124c647
--- /dev/null
+++ b/current/sdk_library/public/conscrypt.module.intra.core.api.srcjar
Binary files differ
diff --git a/current/sdk_library/public/conscrypt.module.platform.api.srcjar b/current/sdk_library/public/conscrypt.module.platform.api.srcjar
new file mode 100644
index 0000000..e115efd
--- /dev/null
+++ b/current/sdk_library/public/conscrypt.module.platform.api.srcjar
Binary files differ
diff --git a/current/sdk_library/public/conscrypt.module.public.api.srcjar b/current/sdk_library/public/conscrypt.module.public.api.srcjar
new file mode 100644
index 0000000..e7ef027
--- /dev/null
+++ b/current/sdk_library/public/conscrypt.module.public.api.srcjar
Binary files differ
diff --git a/current/x86/lib/libconscrypt_jni.so b/current/x86/lib/libconscrypt_jni.so
old mode 100755
new mode 100644
index b7671e3..9780b5f
--- 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
old mode 100755
new mode 100644
index cf13348..2a3a04d
--- a/current/x86_64/lib/libconscrypt_jni.so
+++ b/current/x86_64/lib/libconscrypt_jni.so
Binary files differ
