Revert "cronet: update prebuilts to 107.0.5284.2" am: b8c4d970db
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Cronet/+/2231750
Change-Id: I4841ae3498eba5a64e4234a1647c54ed4f365c58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index cad0162..ec7158c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,7 +38,7 @@
}
cc_prebuilt_library_shared {
- name: "libcronet.107.0.5284.2",
+ name: "libcronet.80.0.3986.0",
// STOPSHIP: Confirm if it is safe
shared_libs: [
"libandroid",
@@ -50,16 +50,16 @@
stl: "libc++_static",
target: {
android_arm64: {
- srcs: ["prebuilt/libs/arm64-v8a/libcronet.107.0.5284.2.so"],
+ srcs: ["prebuilt/libs/arm64-v8a/libcronet.80.0.3986.0.so"],
},
android_arm: {
- srcs: ["prebuilt/libs/armeabi-v7a/libcronet.107.0.5284.2.so"],
+ srcs: ["prebuilt/libs/armeabi-v7a/libcronet.80.0.3986.0.so"],
},
android_x86_64: {
- srcs: ["prebuilt/libs/x86_64/libcronet.107.0.5284.2.so"],
+ srcs: ["prebuilt/libs/x86_64/libcronet.80.0.3986.0.so"],
},
android_x86: {
- srcs: ["prebuilt/libs/x86/libcronet.107.0.5284.2.so"],
+ srcs: ["prebuilt/libs/x86/libcronet.80.0.3986.0.so"],
},
},
// These are already stripped, and restripping them just issues diagnostics.
diff --git a/apex/Android.bp b/apex/Android.bp
index 9189ff9..1ac370d 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -19,7 +19,7 @@
apex_defaults {
name: "com.android.cronet-defaults",
compile_multilib: "both",
- jni_libs: ["libcronet.107.0.5284.2"],
+ jni_libs: ["libcronet.80.0.3986.0"],
java_libs: ["org.chromium.net.cronet"],
key: "com.android.cronet.key",
certificate: ":com.android.cronet.certificate",
diff --git a/prebuilt/cronet_api-src.jar b/prebuilt/cronet_api-src.jar
index 924b877..9d0aa34 100644
--- a/prebuilt/cronet_api-src.jar
+++ b/prebuilt/cronet_api-src.jar
Binary files differ
diff --git a/prebuilt/cronet_api.jar b/prebuilt/cronet_api.jar
index 977b28d..b0c3967 100644
--- a/prebuilt/cronet_api.jar
+++ b/prebuilt/cronet_api.jar
Binary files differ
diff --git a/prebuilt/cronet_impl_common_java.jar b/prebuilt/cronet_impl_common_java.jar
index fa71bf3..7006c09 100644
--- a/prebuilt/cronet_impl_common_java.jar
+++ b/prebuilt/cronet_impl_common_java.jar
Binary files differ
diff --git a/prebuilt/cronet_impl_native_java.jar b/prebuilt/cronet_impl_native_java.jar
index 4cdd6f3..835d882 100644
--- a/prebuilt/cronet_impl_native_java.jar
+++ b/prebuilt/cronet_impl_native_java.jar
Binary files differ
diff --git a/prebuilt/cronet_impl_platform_java.jar b/prebuilt/cronet_impl_platform_java.jar
index 6d6042f..8394ddb 100644
--- a/prebuilt/cronet_impl_platform_java.jar
+++ b/prebuilt/cronet_impl_platform_java.jar
Binary files differ
diff --git a/prebuilt/libs/arm64-v8a/libcronet.107.0.5284.2.so b/prebuilt/libs/arm64-v8a/libcronet.107.0.5284.2.so
deleted file mode 100644
index 7f2540a..0000000
--- a/prebuilt/libs/arm64-v8a/libcronet.107.0.5284.2.so
+++ /dev/null
Binary files differ
diff --git a/prebuilt/libs/arm64-v8a/libcronet.80.0.3986.0.so b/prebuilt/libs/arm64-v8a/libcronet.80.0.3986.0.so
new file mode 100644
index 0000000..34809eb
--- /dev/null
+++ b/prebuilt/libs/arm64-v8a/libcronet.80.0.3986.0.so
Binary files differ
diff --git a/prebuilt/libs/armeabi-v7a/libcronet.107.0.5284.2.so b/prebuilt/libs/armeabi-v7a/libcronet.107.0.5284.2.so
deleted file mode 100644
index 115429a..0000000
--- a/prebuilt/libs/armeabi-v7a/libcronet.107.0.5284.2.so
+++ /dev/null
Binary files differ
diff --git a/prebuilt/libs/armeabi-v7a/libcronet.80.0.3986.0.so b/prebuilt/libs/armeabi-v7a/libcronet.80.0.3986.0.so
new file mode 100644
index 0000000..91bd63f
--- /dev/null
+++ b/prebuilt/libs/armeabi-v7a/libcronet.80.0.3986.0.so
Binary files differ
diff --git a/prebuilt/libs/x86/libcronet.107.0.5284.2.so b/prebuilt/libs/x86/libcronet.107.0.5284.2.so
deleted file mode 100644
index 27923f7..0000000
--- a/prebuilt/libs/x86/libcronet.107.0.5284.2.so
+++ /dev/null
Binary files differ
diff --git a/prebuilt/libs/x86/libcronet.80.0.3986.0.so b/prebuilt/libs/x86/libcronet.80.0.3986.0.so
new file mode 100644
index 0000000..b97d497
--- /dev/null
+++ b/prebuilt/libs/x86/libcronet.80.0.3986.0.so
Binary files differ
diff --git a/prebuilt/libs/x86_64/libcronet.107.0.5284.2.so b/prebuilt/libs/x86_64/libcronet.107.0.5284.2.so
deleted file mode 100644
index 803e5cd..0000000
--- a/prebuilt/libs/x86_64/libcronet.107.0.5284.2.so
+++ /dev/null
Binary files differ
diff --git a/prebuilt/libs/x86_64/libcronet.80.0.3986.0.so b/prebuilt/libs/x86_64/libcronet.80.0.3986.0.so
new file mode 100644
index 0000000..14c6281
--- /dev/null
+++ b/prebuilt/libs/x86_64/libcronet.80.0.3986.0.so
Binary files differ
