From 97164e8c2e29052afc70db3ce2d1a6a7e3b91337 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 5 Jan 2023 13:52:58 +0800 Subject: [PATCH 1/5] Fix cronet library --- app/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index c6d57eb6..7f312713 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,6 +10,7 @@ android { applicationId "com.github.catvod.demo" minSdk 17 targetSdk 29 + ndk { abiFilters "armeabi-v7a" } } buildTypes { @@ -33,7 +34,7 @@ android { dependencies { //Debug For HTTP/3 - //implementation 'com.google.android.gms:play-services-cronet:18.0.1' + //implementation 'org.chromium.net:cronet-embedded:101.4951.41' implementation 'com.google.net.cronet:cronet-okhttp:0.1.0' implementation 'androidx.annotation:annotation:1.5.0' implementation 'com.squareup.okhttp3:okhttp:3.12.13' From 95a38aeb6fa64940d8306ef693c56b4cf016bba0 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 5 Jan 2023 14:26:13 +0800 Subject: [PATCH 2/5] Update build.gradle --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index 7f312713..f23d2785 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,6 +34,7 @@ android { dependencies { //Debug For HTTP/3 + //implementation 'com.google.android.gms:play-services-cronet:18.0.1' //implementation 'org.chromium.net:cronet-embedded:101.4951.41' implementation 'com.google.net.cronet:cronet-okhttp:0.1.0' implementation 'androidx.annotation:annotation:1.5.0' From f2b43063e54bb093670a93e65252bc57bc7e8c0f Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 5 Jan 2023 14:54:59 +0800 Subject: [PATCH 3/5] Update proguard-rules.pro --- app/proguard-rules.pro | 1 - 1 file changed, 1 deletion(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 481d17d5..8851159e 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -31,5 +31,4 @@ -keep class okhttp3.**{*;} # Cronet --keep class org.chromium.net.**{*;} -keep class com.google.net.cronet.**{*;} \ No newline at end of file From 2642f415babf8b639f9d2f7288b49276f46dc305 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 5 Jan 2023 15:18:54 +0800 Subject: [PATCH 4/5] Update proguard-rules.pro --- app/proguard-rules.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 8851159e..481d17d5 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -31,4 +31,5 @@ -keep class okhttp3.**{*;} # Cronet +-keep class org.chromium.net.**{*;} -keep class com.google.net.cronet.**{*;} \ No newline at end of file From 7dca3c491d087e0e8cdb76594fb91a76d84cb618 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 5 Jan 2023 15:48:28 +0800 Subject: [PATCH 5/5] Update build.gradle --- app/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index f23d2785..7f312713 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,7 +34,6 @@ android { dependencies { //Debug For HTTP/3 - //implementation 'com.google.android.gms:play-services-cronet:18.0.1' //implementation 'org.chromium.net:cronet-embedded:101.4951.41' implementation 'com.google.net.cronet:cronet-okhttp:0.1.0' implementation 'androidx.annotation:annotation:1.5.0'