Bump cronet from 123.0.6312.80 to 127.0.6533.64

- Changes in the [Git log](https://chromium.googlesource.com/chromium/src/+log/123.0.6312.80..127.0.6533.64)
gedoor · Aug 3, 2024 · f591ae7 · f591ae7
1 parent 8b76f06
commit f591ae7
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 29 deletions.
diff --git a/app/cronet-proguard-rules.pro b/app/cronet-proguard-rules.pro
@@ -1,23 +1,14 @@
-# -------- Config Path: base/android/proguard/chromium_code.flags --------
+# -------- Config Path: base/android/proguard/shared_with_cronet.flags --------
 # Copyright 2016 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Contains flags that can be safely shared with Cronet, and thus would be
-# appropriate for third-party apps to include.
+# Contains flags that we want to apply not only to Chromium APKs, but also to
+# third-party apps that bundle the Cronet library.
 
-# Allow unused native methods to be removed, but prevent renaming on those that are kept.
--keepclasseswithmembernames,includedescriptorclasses,allowaccessmodification class !cr_allowunused,** {
- native <methods>;
-}
-
-# Use assumevalues block instead of assumenosideeffects block because Google3 proguard cannot parse
-# assumenosideeffects blocks which overwrite return value.
-# chromium_code.flags rather than remove_logging.flags so that it's included
-# in cronet.
--assumevalues class org.chromium.base.Log {
- static boolean isDebug() return false;
-}
+# WARNING: rules in this file are applied to entire third-party APKs, not just
+# Chromium code. They MUST be scoped appropriately to avoid side effects on app
+# code that we do not own.
 
 # Keep all CREATOR fields within Parcelable that are kept.
 -keepclassmembers class !cr_allowunused,org.chromium.** implements android.os.Parcelable {
@@ -37,21 +28,10 @@
  public static **[] values();
 }
 
-# -identifiernamestring doesn't keep the module impl around, we have to
-# explicitly keep it.
--if @org.chromium.components.module_installer.builder.ModuleInterface interface *
--keep,allowobfuscation,allowaccessmodification class !cr_allowunused,** extends <1> {
- <init>();
-}
-
 # Required to remove fields until b/274802355 is resolved.
 -assumevalues class !cr_allowunused,** {
  final org.chromium.base.ThreadUtils$ThreadChecker * return _NONNULL_;
 }
-
-# TODO(agrieve): Remove once we start to use Android U SDK.
--dontwarn android.window.BackEvent
--dontwarn android.window.OnBackAnimationCallback
 # -------- Config Path: build/android/chromium_annotations.flags --------
 # Copyright 2022 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
@@ -113,6 +93,22 @@
 -identifiernamestring class * {
  @org.chromium.build.annotations.IdentifierNameString *;
 }
+
+# Mark fields with this to help R8 figure out that they cannot be null.
+# Use assumevalues in addition to assumenosideeffects block because Google3 proguard cannot parse
+# assumenosideeffects blocks which overwrite return value.
+-assumevalues class ** {
+ @org.chromium.build.annotations.AssumeNonNull *** *(...) return _NONNULL_;
+}
+-assumenosideeffects class ** {
+ @org.chromium.build.annotations.AssumeNonNull *** *(...);
+}
+-assumevalues class ** {
+ @org.chromium.build.annotations.AssumeNonNull *** * return _NONNULL_;
+}
+-assumenosideeffects class ** {
+ @org.chromium.build.annotations.AssumeNonNull *** *;
+}
 # -------- Config Path: components/cronet/android/cronet_impl_common_proguard.cfg --------
 # Proguard config for apps that depend on cronet_impl_common_java.jar.
 
@@ -227,3 +223,10 @@
 -keepclasseswithmembers,includedescriptorclasses,allowaccessmodification class ** {
  @org.jni_zero.CalledByNativeUnchecked <methods>;
 }
+
+# Allow unused native methods to be removed, but prevent renaming on those that
+# are kept.
+# TODO(crbug.com/315973491): Restrict the broad scope of this rule.
+-keepclasseswithmembernames,includedescriptorclasses,allowaccessmodification class ** {
+ native <methods>;
+}
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 @@
-{"arm64-v8a":"bbf2c50d1ebf0763d451b08e290a3244","armeabi-v7a":"ecb872f7b1b5342f4d7c36262bec0600","x86":"4da4832b89e2412d808c5b1ecdc24e3d","x86_64":"62080f051db02ed0e939affb39ce67fb","version":"123.0.6312.80"}
+{"x86_64":"550762ae8cf06387127646b0b356201d","arm64-v8a":"cb4a468bbc42a7fa86cb83f9c0c1f19c","armeabi-v7a":"b2960e2f105f9808bacf5bf0d983ffe8","x86":"33e3d97ff9139e9cce8a94e4cc9a4fc5","version":"127.0.6533.64"}
diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md
@@ -13,6 +13,7 @@
 * 漫画源看书显示乱码，**阅读与其他软件的源并不通用**，请导入阅读的支持的漫画源！
 
 **2024/02/27**
+* 更新cronet: 127.0.6533.64
 * 更新cronet: 123.0.6312.80
 * 更新cronet: 123.0.6312.40
 

diff --git a/gradle.properties b/gradle.properties
@@ -42,8 +42,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=123.0.6312.80
-CronetMainVersion=123.0.0.0
+CronetVersion=127.0.6533.64
+CronetMainVersion=127.0.0.0
 android.injected.testOnly=false
 android.nonFinalResIds=true
 android.injected.androidTest.leaveApksInstalledAfterRun=true