mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-22 08:24:25 +01:00
Improve openSSL on android-* image
Improve openSSL on android-* image Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
parent
8bc72c75d3
commit
ad924d922b
8
.github/workflows/main.yml
vendored
8
.github/workflows/main.yml
vendored
@ -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
|
||||
- {
|
||||
|
@ -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 \
|
||||
|
@ -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 \
|
||||
|
@ -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 \
|
||||
|
@ -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 \
|
||||
|
Loading…
Reference in New Issue
Block a user