From 8bc72c75d3652692d6b22ac4c8d0a4e953c53837 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Fri, 27 Aug 2021 13:13:48 +0200 Subject: [PATCH] Add ANDROID_NDK_HOME env variable and enable openssl Add ANDROID_NDK_HOME env variable and enable openssl Signed-off-by: Bensuperpc --- .github/workflows/main.yml | 8 ++++---- android-arm/Dockerfile.in | 1 + android-arm64/Dockerfile.in | 1 + android-x86/Dockerfile | 1 + android-x86_64/Dockerfile | 1 + 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b4f8a92..a265bab 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,7 +54,7 @@ jobs: stockfish_arg: "ARCH=armv7 COMP=ndk", ninja: "no", ninja_arg: "", - openssl: "no", + openssl: "yes", openssl_arg: "android-arm", } - { @@ -63,7 +63,7 @@ jobs: stockfish_arg: "ARCH=armv8 COMP=ndk", ninja: "no", ninja_arg: "", - openssl: "no", + openssl: "yes", openssl_arg: "android-arm64", } - { @@ -72,7 +72,7 @@ jobs: stockfish_arg: "ARCH=x86-32 COMP=ndk", ninja: "no", ninja_arg: "", - openssl: "no", + openssl: "yes", openssl_arg: "android-x86", } - { @@ -81,7 +81,7 @@ jobs: stockfish_arg: "ARCH=x86-64 COMP=ndk", ninja: "no", ninja_arg: "", - openssl: "no", + openssl: "yes", openssl_arg: "android-x86_64", } # Linux arm64/armv8 images diff --git a/android-arm/Dockerfile.in b/android-arm/Dockerfile.in index 65b4d06..d5e4db8 100644 --- a/android-arm/Dockerfile.in +++ b/android-arm/Dockerfile.in @@ -9,6 +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 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 6cbbedf..33dc379 100644 --- a/android-arm64/Dockerfile.in +++ b/android-arm64/Dockerfile.in @@ -13,6 +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 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 e4f31a7..17b4008 100644 --- a/android-x86/Dockerfile +++ b/android-x86/Dockerfile @@ -4,6 +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 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 0ac2690..988dda9 100644 --- a/android-x86_64/Dockerfile +++ b/android-x86_64/Dockerfile @@ -4,6 +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 AS=${CROSS_ROOT}/bin/llvm-as \ AR=${CROSS_ROOT}/bin/llvm-ar \ CC=${CROSS_ROOT}/bin/clang \