cronet: update prebuilts to 107.0.5284.2
Trying this again.
Test: atest CronetApiTest
Change-Id: I96bfcacad04c16a89bbfdef0e734c20c930071fd
diff --git a/Cronet/Android.bp b/Cronet/Android.bp
index e699656..2e7e7cf 100644
--- a/Cronet/Android.bp
+++ b/Cronet/Android.bp
@@ -41,7 +41,7 @@
}
cc_prebuilt_library_shared {
- name: "libcronet.80.0.3986.0",
+ name: "libcronet.107.0.5284.2",
shared_libs: [
"libandroid",
"libc",
@@ -52,16 +52,16 @@
stl: "libc++_static",
target: {
android_arm64: {
- srcs: ["prebuilt/libs/arm64-v8a/libcronet.80.0.3986.0.so"],
+ srcs: ["prebuilt/libs/arm64-v8a/libcronet.107.0.5284.2.so"],
},
android_arm: {
- srcs: ["prebuilt/libs/armeabi-v7a/libcronet.80.0.3986.0.so"],
+ srcs: ["prebuilt/libs/armeabi-v7a/libcronet.107.0.5284.2.so"],
},
android_x86_64: {
- srcs: ["prebuilt/libs/x86_64/libcronet.80.0.3986.0.so"],
+ srcs: ["prebuilt/libs/x86_64/libcronet.107.0.5284.2.so"],
},
android_x86: {
- srcs: ["prebuilt/libs/x86/libcronet.80.0.3986.0.so"],
+ srcs: ["prebuilt/libs/x86/libcronet.107.0.5284.2.so"],
},
},
// These are already stripped, and restripping them just issues diagnostics.
@@ -91,6 +91,7 @@
"androidx.annotation_annotation",
],
static_libs: [
+ "androidx.core_core-nodeps",
"cronet_impl_common_java",
"cronet_impl_native_java",
"cronet_impl_platform_java",
@@ -100,4 +101,5 @@
dist_group: "android",
// cronet is used as a shared library.
shared_library: true,
+ exclude_kotlinc_generated_files: true,
}
diff --git a/Cronet/apex/Android.bp b/Cronet/apex/Android.bp
index 64362da..de48589 100644
--- a/Cronet/apex/Android.bp
+++ b/Cronet/apex/Android.bp
@@ -30,7 +30,7 @@
apex_defaults {
name: "CronetApexDefaultsEnabled",
- jni_libs: ["libcronet.80.0.3986.0"],
+ jni_libs: ["libcronet.107.0.5284.2"],
java_libs: ["framework-cronet"],
}
diff --git a/Cronet/prebuilt/cronet_api-src.jar b/Cronet/prebuilt/cronet_api-src.jar
index 9d0aa34..924b877 100644
--- a/Cronet/prebuilt/cronet_api-src.jar
+++ b/Cronet/prebuilt/cronet_api-src.jar
Binary files differ
diff --git a/Cronet/prebuilt/cronet_api.jar b/Cronet/prebuilt/cronet_api.jar
index b0c3967..977b28d 100644
--- a/Cronet/prebuilt/cronet_api.jar
+++ b/Cronet/prebuilt/cronet_api.jar
Binary files differ
diff --git a/Cronet/prebuilt/cronet_impl_common_java.jar b/Cronet/prebuilt/cronet_impl_common_java.jar
index 7006c09..fa71bf3 100644
--- a/Cronet/prebuilt/cronet_impl_common_java.jar
+++ b/Cronet/prebuilt/cronet_impl_common_java.jar
Binary files differ
diff --git a/Cronet/prebuilt/cronet_impl_native_java.jar b/Cronet/prebuilt/cronet_impl_native_java.jar
index 835d882..4cdd6f3 100644
--- a/Cronet/prebuilt/cronet_impl_native_java.jar
+++ b/Cronet/prebuilt/cronet_impl_native_java.jar
Binary files differ
diff --git a/Cronet/prebuilt/cronet_impl_platform_java.jar b/Cronet/prebuilt/cronet_impl_platform_java.jar
index 8394ddb..6d6042f 100644
--- a/Cronet/prebuilt/cronet_impl_platform_java.jar
+++ b/Cronet/prebuilt/cronet_impl_platform_java.jar
Binary files differ
diff --git a/Cronet/prebuilt/libs/arm64-v8a/libcronet.107.0.5284.2.so b/Cronet/prebuilt/libs/arm64-v8a/libcronet.107.0.5284.2.so
new file mode 100644
index 0000000..7f2540a
--- /dev/null
+++ b/Cronet/prebuilt/libs/arm64-v8a/libcronet.107.0.5284.2.so
Binary files differ
diff --git a/Cronet/prebuilt/libs/arm64-v8a/libcronet.80.0.3986.0.so b/Cronet/prebuilt/libs/arm64-v8a/libcronet.80.0.3986.0.so
deleted file mode 100644
index 34809eb..0000000
--- a/Cronet/prebuilt/libs/arm64-v8a/libcronet.80.0.3986.0.so
+++ /dev/null
Binary files differ
diff --git a/Cronet/prebuilt/libs/armeabi-v7a/libcronet.107.0.5284.2.so b/Cronet/prebuilt/libs/armeabi-v7a/libcronet.107.0.5284.2.so
new file mode 100644
index 0000000..115429a
--- /dev/null
+++ b/Cronet/prebuilt/libs/armeabi-v7a/libcronet.107.0.5284.2.so
Binary files differ
diff --git a/Cronet/prebuilt/libs/armeabi-v7a/libcronet.80.0.3986.0.so b/Cronet/prebuilt/libs/armeabi-v7a/libcronet.80.0.3986.0.so
deleted file mode 100644
index 91bd63f..0000000
--- a/Cronet/prebuilt/libs/armeabi-v7a/libcronet.80.0.3986.0.so
+++ /dev/null
Binary files differ
diff --git a/Cronet/prebuilt/libs/x86/libcronet.107.0.5284.2.so b/Cronet/prebuilt/libs/x86/libcronet.107.0.5284.2.so
new file mode 100644
index 0000000..27923f7
--- /dev/null
+++ b/Cronet/prebuilt/libs/x86/libcronet.107.0.5284.2.so
Binary files differ
diff --git a/Cronet/prebuilt/libs/x86/libcronet.80.0.3986.0.so b/Cronet/prebuilt/libs/x86/libcronet.80.0.3986.0.so
deleted file mode 100644
index b97d497..0000000
--- a/Cronet/prebuilt/libs/x86/libcronet.80.0.3986.0.so
+++ /dev/null
Binary files differ
diff --git a/Cronet/prebuilt/libs/x86_64/libcronet.107.0.5284.2.so b/Cronet/prebuilt/libs/x86_64/libcronet.107.0.5284.2.so
new file mode 100644
index 0000000..803e5cd
--- /dev/null
+++ b/Cronet/prebuilt/libs/x86_64/libcronet.107.0.5284.2.so
Binary files differ
diff --git a/Cronet/prebuilt/libs/x86_64/libcronet.80.0.3986.0.so b/Cronet/prebuilt/libs/x86_64/libcronet.80.0.3986.0.so
deleted file mode 100644
index 14c6281..0000000
--- a/Cronet/prebuilt/libs/x86_64/libcronet.80.0.3986.0.so
+++ /dev/null
Binary files differ