Skip to content

Commit

Permalink
Bump cronet from 128.0.6613.40 to 131.0.6778.200
Browse files Browse the repository at this point in the history
  • Loading branch information
iyhkhtrk authored and github-actions[bot] committed Dec 19, 2024
1 parent 8387b40 commit 7d4a057
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 15 deletions.
29 changes: 18 additions & 11 deletions app/cronet-proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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>;
}

Expand Down Expand Up @@ -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
Expand All @@ -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;
}
Binary file modified app/cronetlib/cronet_api.jar
Binary file not shown.
Binary file modified app/cronetlib/cronet_impl_common_java.jar
Binary file not shown.
Binary file modified app/cronetlib/cronet_impl_native_java.jar
Binary file not shown.
Binary file modified app/cronetlib/cronet_impl_platform_java.jar
Binary file not shown.
Binary file modified app/cronetlib/cronet_shared_java.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion app/src/main/assets/cronet.json
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":"8e6ab45fd1ab7869c176a6f62f95b18a","x86_64":"26075434a48c1ad802c8bf1b2764010c","arm64-v8a":"addd1c3316c23997a3f147d9c0173993","armeabi-v7a":"d0346f7e507d7beeded5da5d3da6a2fe","version":"131.0.6778.200"}
2 changes: 1 addition & 1 deletion app/src/main/assets/updateLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 关注公众号 **[开源阅读]** 菜单•软件下载 提前享受新版本。
* 关注合作公众号 **[小说拾遗]** 获取好看的小说。

## cronet版本: 128.0.6613.40
## cronet版本: 131.0.6778.200

## **必读**

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.200
CronetMainVersion=131.0.0.0
android.injected.testOnly=false
android.nonFinalResIds=true
android.injected.androidTest.leaveApksInstalledAfterRun=true

0 comments on commit 7d4a057

Please sign in to comment.