Xwite 2 лет назад
Родитель
Сommit
b795235546
4 измененных файлов с 4 добавлено и 4 удалено
  1. 1 1
      .github/scripts/cronet.sh
  2. 2 2
      .github/workflows/cronet.yml
  3. 1 1
      app/build.gradle
  4. 0 0
      app/cronet-proguard-rules.pro

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

@@ -58,7 +58,7 @@ function sync_proguard_rules() {
     local proguard_paths=(
       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
     echo "fetch cronet proguard rules from upstream $raw_github_git"
     for path in ${proguard_paths[@]}

+ 2 - 2
.github/workflows/cronet.yml

@@ -49,5 +49,5 @@ jobs:
             *cronet*jar
             *cronet.json
             *updateLog.md
-            gradle.properties
-            cronet_proguard_rules.pro
+            *gradle.properties
+            *cronet-proguard-rules.pro

+ 1 - 1
app/build.gradle

@@ -90,7 +90,7 @@ android {
             applicationIdSuffix '.debug'
             versionNameSuffix 'debug'
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro', 'cronet_proguard_rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro', 'cronet-proguard-rules.pro'
         }
     }
     //noinspection GrDeprecatedAPIUsage

+ 0 - 0
app/cronet-proguard-rules.pro