Fix build

vvb2060 · Sep 17, 2023 · 684c797 · 684c797
1 parent 5ce368b
commit 684c797
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git 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
@@ -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
+1 −1		lib/connect.c
+1 −1		lib/http2.c
+3 −3		lib/mqtt.c
+6 −6		lib/url.c