diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a265bab..01e1b72 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,7 +55,7 @@ jobs: ninja: "no", ninja_arg: "", openssl: "yes", - openssl_arg: "android-arm", + openssl_arg: "android-arm no-shared", } - { image: "android-arm64", @@ -64,7 +64,7 @@ jobs: ninja: "no", ninja_arg: "", openssl: "yes", - openssl_arg: "android-arm64", + openssl_arg: "android-arm64 no-shared", } - { image: "android-x86", @@ -73,7 +73,7 @@ jobs: ninja: "no", ninja_arg: "", openssl: "yes", - openssl_arg: "android-x86", + openssl_arg: "android-x86 no-shared", } - { image: "android-x86_64", @@ -82,7 +82,7 @@ jobs: ninja: "no", ninja_arg: "", openssl: "yes", - openssl_arg: "android-x86_64", + openssl_arg: "android-x86_64 no-shared", } # Linux arm64/armv8 images - { diff --git a/android-arm/Dockerfile.in b/android-arm/Dockerfile.in index d5e4db8..deef04a 100644 --- a/android-arm/Dockerfile.in +++ b/android-arm/Dockerfile.in @@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y \ ENV CROSS_TRIPLE=arm-linux-androideabi ENV CROSS_ROOT=/usr/${CROSS_TRIPLE} -ENV ANDROID_NDK_HOME=${CROSS_ROOT} +ENV ANDROID_NDK=${CROSS_ROOT} ENV AS=${CROSS_ROOT}/bin/llvm-as \ AR=${CROSS_ROOT}/bin/llvm-ar \ CC=${CROSS_ROOT}/bin/clang \ diff --git a/android-arm64/Dockerfile.in b/android-arm64/Dockerfile.in index 33dc379..6c2d0e0 100644 --- a/android-arm64/Dockerfile.in +++ b/android-arm64/Dockerfile.in @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \ ENV CROSS_TRIPLE=aarch64-linux-android ENV CROSS_ROOT=/usr/${CROSS_TRIPLE} -ENV ANDROID_NDK_HOME=${CROSS_ROOT} +ENV ANDROID_NDK=${CROSS_ROOT} ENV AS=${CROSS_ROOT}/bin/llvm-as \ AR=${CROSS_ROOT}/bin/llvm-ar \ CC=${CROSS_ROOT}/bin/clang \ diff --git a/android-x86/Dockerfile b/android-x86/Dockerfile index 17b4008..9d719a9 100644 --- a/android-x86/Dockerfile +++ b/android-x86/Dockerfile @@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -y unzip ENV CROSS_TRIPLE=i686-linux-android ENV CROSS_ROOT=/usr/${CROSS_TRIPLE} -ENV ANDROID_NDK_HOME=${CROSS_ROOT} +ENV ANDROID_NDK=${CROSS_ROOT} ENV AS=${CROSS_ROOT}/bin/llvm-as \ AR=${CROSS_ROOT}/bin/llvm-ar \ CC=${CROSS_ROOT}/bin/clang \ diff --git a/android-x86_64/Dockerfile b/android-x86_64/Dockerfile index 988dda9..ddc811e 100644 --- a/android-x86_64/Dockerfile +++ b/android-x86_64/Dockerfile @@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -y unzip ENV CROSS_TRIPLE=x86_64-linux-android ENV CROSS_ROOT=/usr/${CROSS_TRIPLE} -ENV ANDROID_NDK_HOME=${CROSS_ROOT} +ENV ANDROID_NDK=${CROSS_ROOT} ENV AS=${CROSS_ROOT}/bin/llvm-as \ AR=${CROSS_ROOT}/bin/llvm-ar \ CC=${CROSS_ROOT}/bin/clang \