Bump cronet from 128.0.6613.40 to 131.0.6778.81

- Changes in the [Git log](https://chromium.googlesource.com/chromium/src/+log/128.0.6613.40..131.0.6778.81)
iyhkhtrk · Nov 25, 2024 · f18bfc9 · f18bfc9
1 parent 6c18838
commit f18bfc9
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 15 deletions.
diff --git a/app/cronet-proguard-rules.pro b/app/cronet-proguard-rules.pro
@@ -133,15 +133,15 @@
 -keep @interface org.chromium.build.annotations.DoNotInline
 -keep @interface org.chromium.build.annotations.UsedByReflection
 -keep @interface org.chromium.build.annotations.IdentifierNameString
--keep @interface org.jni_zero.AccessedByNative
--keep @interface org.jni_zero.CalledByNative
--keep @interface org.jni_zero.CalledByNativeUnchecked
+# ** prefixed since JNI Zero classes included in cronet are jarjared to prevent
+# clashes with the real JNI Zero. See https://crbug.com/353534209
+-keep @interface **org.jni_zero.AccessedByNative
+-keep @interface **org.jni_zero.CalledByNative
+-keep @interface **org.jni_zero.CalledByNativeUnchecked
 
 # Suppress unnecessary warnings.
 -dontnote org.chromium.net.ProxyChangeListener$ProxyReceiver
 -dontnote org.chromium.net.AndroidKeyStore
-# Needs 'void setTextAppearance(int)' (API level 23).
--dontwarn org.chromium.base.ApiCompatibilityUtils
 # Needs 'boolean onSearchRequested(android.view.SearchEvent)' (API level 23).
 -dontwarn org.chromium.base.WindowCallbackWrapper
 
@@ -171,7 +171,9 @@
 # See crbug.com/1440987. We must keep every native that we are manually
 # registering. If Cronet bumps its min-sdk past 21, we may be able to move to
 # automatic JNI registration.
--keepclasseswithmembers,includedescriptorclasses,allowaccessmodification class org.chromium.**,J.N {
+# ** prefixed since JNI Zero classes included in cronet are jarjared to prevent
+# clashes with the real JNI Zero. See https://crbug.com/353534209
+-keepclasseswithmembers,includedescriptorclasses,allowaccessmodification class org.chromium.**,**J.N {
   native <methods>;
 }
 
@@ -215,13 +217,13 @@
 
 # Keeps for method level annotations.
 -keepclasseswithmembers,allowaccessmodification class ** {
-  @org.jni_zero.AccessedByNative <fields>;
+  @**org.jni_zero.AccessedByNative <fields>;
 }
--keepclasseswithmembers,includedescriptorclasses,allowaccessmodification class ** {
-  @org.jni_zero.CalledByNative <methods>;
+-keepclasseswithmembers,includedescriptorclasses,allowaccessmodification,allowoptimization class ** {
+  @**org.jni_zero.CalledByNative <methods>;
 }
--keepclasseswithmembers,includedescriptorclasses,allowaccessmodification class ** {
-  @org.jni_zero.CalledByNativeUnchecked <methods>;
+-keepclasseswithmembers,includedescriptorclasses,allowaccessmodification,allowoptimization class ** {
+  @**org.jni_zero.CalledByNativeUnchecked <methods>;
 }
 
 # Allow unused native methods to be removed, but prevent renaming on those that
@@ -230,3 +232,8 @@
 -keepclasseswithmembernames,includedescriptorclasses,allowaccessmodification class ** {
   native <methods>;
 }
+
+# Used when multiplexing. We don't package our own @UsedByReflection, so using this instead.
+-keepclasseswithmembers class !cr_allowunused,**J.N {
+  public long *_HASH;
+}
diff --git a/app/cronetlib/cronet_api.jar b/app/cronetlib/cronet_api.jar
diff --git a/app/cronetlib/cronet_impl_common_java.jar b/app/cronetlib/cronet_impl_common_java.jar
diff --git a/app/cronetlib/cronet_impl_native_java.jar b/app/cronetlib/cronet_impl_native_java.jar
diff --git a/app/cronetlib/cronet_impl_platform_java.jar b/app/cronetlib/cronet_impl_platform_java.jar
diff --git a/app/cronetlib/cronet_shared_java.jar b/app/cronetlib/cronet_shared_java.jar
diff --git a/app/src/main/assets/cronet.json b/app/src/main/assets/cronet.json
@@ -1 +1 @@
-{"x86":"2288814a4d9d4ee24154f52abf227fa0","armeabi-v7a":"ac8190c5e795d1a754b7bf2d477119c5","x86_64":"116f2d0f8e6363caacbd5c38bfc45b9f","arm64-v8a":"61a96a20241e56ac7ab107cc3e4c3fda","version":"128.0.6613.40"}
+{"x86":"6a0e83979980e1eed39d4c4ef48a4ae2","x86_64":"cf8adad89b0672984b6d569f246894e0","arm64-v8a":"cfce56c5bd3bc9717da03ec5cfcca271","armeabi-v7a":"4f21882049d7b4a2519631ff43d9f481","version":"131.0.6778.81"}
diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md
@@ -3,7 +3,7 @@
 * 关注公众号 **[开源阅读]** 菜单•软件下载 提前享受新版本。
 * 关注合作公众号 **[小说拾遗]** 获取好看的小说。
 
-## cronet版本: 128.0.6613.40
+## cronet版本: 131.0.6778.81
 
 ## **必读**
 

diff --git a/gradle.properties b/gradle.properties
@@ -41,8 +41,8 @@ android.defaults.buildfeatures.shaders=false
 # and none from the library's dependencies, thereby reducing the size of the R class for that library.
 android.nonTransitiveRClass=true
 # https://chromiumdash.appspot.com/releases?platform=Android
-CronetVersion=128.0.6613.40
-CronetMainVersion=128.0.0.0
+CronetVersion=131.0.6778.81
+CronetMainVersion=131.0.0.0
 android.injected.testOnly=false
 android.nonFinalResIds=true
 android.injected.androidTest.leaveApksInstalledAfterRun=true
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"x86":"2288814a4d9d4ee24154f52abf227fa0","armeabi-v7a":"ac8190c5e795d1a754b7bf2d477119c5","x86_64":"116f2d0f8e6363caacbd5c38bfc45b9f","arm64-v8a":"61a96a20241e56ac7ab107cc3e4c3fda","version":"128.0.6613.40"}
		{"x86":"6a0e83979980e1eed39d4c4ef48a4ae2","x86_64":"cf8adad89b0672984b6d569f246894e0","arm64-v8a":"cfce56c5bd3bc9717da03ec5cfcca271","armeabi-v7a":"4f21882049d7b4a2519631ff43d9f481","version":"131.0.6778.81"}