From 684c7972f971718a6f264fabaac343d11131efc2 Mon Sep 17 00:00:00 2001 From: vvb2060 Date: Sun, 17 Sep 2023 19:04:44 +0800 Subject: [PATCH] Fix build --- .github/workflows/android.yml | 9 +++++++++ README.md | 2 +- curl/src/main/native/curl | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 33f5030..97bc5e9 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -28,6 +28,15 @@ jobs: cp curl/src/main/native/config/versions/nghttp3ver.h curl/src/main/native/nghttp3/lib/includes/nghttp3/version.h cp curl/src/main/native/config/versions/ngtcp2ver.h curl/src/main/native/ngtcp2/lib/includes/ngtcp2/version.h echo "#include \"tool_hugehelp.h\"" > curl/src/main/native/curl/src/tool_hugehelp.c + - name: Configuration Environment + shell: bash + run: | + echo 'android.sdk.channel=3' >> gradle.properties + echo 'android.native.buildOutput=verbose' >> gradle.properties + echo 'org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8' >> gradle.properties + echo 'org.gradle.caching=true' >> gradle.properties + echo 'org.gradle.parallel=true' >> gradle.properties + echo '84831b9409646a918e30573bab4c9c91346d8abd' > $ANDROID_SDK_ROOT/licenses/android-sdk-preview-license - name: Build with Gradle run: | ./gradlew :t:assembleRelease diff --git a/README.md b/README.md index 11802c1..544eb4b 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ target_link_libraries(app curl::curl_static) ## Version ### 8.3.0 -- curl 8.3.0 +- curl 8.3.0 with [my patch](https://github.com/curl/curl/pull/11874) - nghttp2 1.56.0 - nghttp3 0.15.0 - ngtcp2 0.19.1 diff --git a/curl/src/main/native/curl b/curl/src/main/native/curl index 6fa1d81..f363ad3 160000 --- a/curl/src/main/native/curl +++ b/curl/src/main/native/curl @@ -1 +1 @@ -Subproject commit 6fa1d817e5b1a00d7d0c8168091877476b499317 +Subproject commit f363ad3bec057bc4155bc9c8facfad9e7e937825