Bläddra i källkod

[skip ci] Update remote cronet proguard url and include cronet_shared_java.jar

Xwite 2 år sedan
förälder
incheckning
22419a267a
2 ändrade filer med 2 tillägg och 6 borttagningar
  1. 1 6
      .github/scripts/cronet.sh
  2. 1 0
      app/download.gradle

+ 1 - 6
.github/scripts/cronet.sh

@@ -56,13 +56,8 @@ function write_github_env_variable() {
 function sync_proguard_rules() {
 function sync_proguard_rules() {
     local raw_github_git="https://raw.githubusercontent.com/chromium/chromium/$lastest_cronet_version"
     local raw_github_git="https://raw.githubusercontent.com/chromium/chromium/$lastest_cronet_version"
     local proguard_paths=(
     local proguard_paths=(
-      base/android/proguard/chromium_code.flags
-      components/cronet/android/cronet_impl_common_proguard.cfg
-      components/cronet/android/cronet_impl_native_proguard.cfg
-      components/cronet/android/cronet_impl_platform_proguard.cfg
-      components/cronet/android/cronet_shared_proguard.cfg
+      components/cronet/android/cronet_combined_impl_native_proguard_golden.cfg
     )
     )
-
     local proguard_rules_path="$GITHUB_WORKSPACE/app/cronet_proguard_rules.pro"
     local proguard_rules_path="$GITHUB_WORKSPACE/app/cronet_proguard_rules.pro"
     rm -f proguard_rules_path
     rm -f proguard_rules_path
     echo "fetch cronet proguard rules from upstream $raw_github_git"
     echo "fetch cronet proguard rules from upstream $raw_github_git"

+ 1 - 0
app/download.gradle

@@ -34,6 +34,7 @@ tasks.register('downloadJar', Download) {
             BASE_PATH + "cronet_impl_common_java.jar",
             BASE_PATH + "cronet_impl_common_java.jar",
             BASE_PATH + "cronet_impl_native_java.jar",
             BASE_PATH + "cronet_impl_native_java.jar",
             BASE_PATH + "cronet_impl_platform_java.jar",
             BASE_PATH + "cronet_impl_platform_java.jar",
+            BASE_PATH + "cronet_shared_java.jar"
     ])
     ])
     dest libPath
     dest libPath
     overwrite true
     overwrite true