diff options
| author | David Carlier <[email protected]> | 2019-07-04 08:11:57 +0000 |
|---|---|---|
| committer | David Carlier <[email protected]> | 2019-07-04 08:11:57 +0000 |
| commit | e4c9d0de72b265b87bb2f495eb9f50754f501fb0 (patch) | |
| tree | ef26b198ca8a012be29453bece556a7233ef00b3 /src | |
| parent | cc2e7a85e5b89391cf49c13a62f56a0e1d9d841a (diff) | |
Changes from feedbacks
Diffstat (limited to 'src')
| -rw-r--r-- | src/scripts/Dockerfile.android | 10 | ||||
| -rw-r--r-- | src/scripts/ci/travis.yml | 8 | ||||
| -rwxr-xr-x | src/scripts/docker-android.sh | 6 |
3 files changed, 15 insertions, 9 deletions
diff --git a/src/scripts/Dockerfile.android b/src/scripts/Dockerfile.android index 57514532c..501e67cec 100644 --- a/src/scripts/Dockerfile.android +++ b/src/scripts/Dockerfile.android @@ -1,7 +1,8 @@ FROM debian:stretch AS debian -ARG SDK +ARG ANDORID_SDK_VER +ARG ANDROID_ARCH +ARG ANDROID_TOOLCHAIN_SUF RUN apt-get update && apt-get -y --no-install-recommends install \ - libboost-all-dev \ make \ python3-sphinx @@ -14,9 +15,6 @@ COPY doc doc COPY license.txt license.txt COPY news.rst news.rst ENV PATH=$PATH:android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/ -RUN ./configure.py --prefix=android/arm --os=android --cpu=arm --cc=clang --cc-bin=armv7a-linux-androideabi${SDK}-clang++ --ar-command=arm-linux-androideabi-ar --with-sphinx -RUN make -j`getconf _NPROCESSORS_ONLN` -RUN make install && make clean -RUN ./configure.py --prefix=android/arm64 --os=android --cpu=arm64 --cc=clang --cc-bin=aarch64-linux-android${SDK}-clang++ --ar-command=aarch64-linux-android-ar --with-sphinx +RUN ./configure.py --prefix=android/arm --os=android --cpu=${ANDROID_ARCH} --cc=clang --cc-bin=armv7a-linux-android${ANDROID_TOOLCHAIN_SUF}${SDK}-clang++ --ar-command=arm-linux-android${ANDROID_TOOLCHAIN_SUF}-ar --with-sphinx RUN make -j`getconf _NPROCESSORS_ONLN` RUN make install diff --git a/src/scripts/ci/travis.yml b/src/scripts/ci/travis.yml index 432c0da95..f8d640ef3 100644 --- a/src/scripts/ci/travis.yml +++ b/src/scripts/ci/travis.yml @@ -17,13 +17,15 @@ services: env: global: - CCACHE_MAXSIZE=800M - - SDK=21 + - ANDROID_SDK_VER=21 matrix: - BUILD_MODE="shared" - BUILD_MODE="coverage" - BUILD_MODE="fuzzers" - BUILD_MODE="valgrind" + - ANDROID_ARCH=arm ANDROID_TOOLCHAIN_SUF=eabi BUILD_MODE="docker-android" + - ANDROID_ARCH=arm64 BUILD_MODE="docker-android" - BUILD_MODE="cross-i386" - BUILD_MODE="cross-ppc32" - BUILD_MODE="cross-ppc64" @@ -38,7 +40,6 @@ env: - BUILD_MODE="nist" - BUILD_MODE="docs" - BUILD_MODE="lint" - - BUILD_MODE="docker-android" matrix: exclude: @@ -96,6 +97,9 @@ matrix: # No docker build on osx - os: osx env: BUILD_MODE="docker-android" + # Nor for gcc's + - compiler: gcc + env: BUILD_MODE="docker-android" install: - ./src/scripts/ci/setup_travis.sh diff --git a/src/scripts/docker-android.sh b/src/scripts/docker-android.sh index 1428c5526..ec23a2cd6 100755 --- a/src/scripts/docker-android.sh +++ b/src/scripts/docker-android.sh @@ -1,6 +1,10 @@ VERSION=`./configure.py --version` mkdir -p docker-builds -docker build -f src/scripts/Dockerfile.android --force-rm -t botan-android-${VERSION} --build-arg SDK=${SDK} . +docker build -f src/scripts/Dockerfile.android --force-rm -t botan-android-${VERSION} \ + --build-arg ANDROID_SDK_VER=${ANDROID_SDK_VER} \ + --build-arg ANDROID_ARCH=${ANDROID_ARCH} \ + --build-arg ANDROID_TOOLCHAIN_SUF=${ANDROID_TOOLCHAIN_SUF} \ + . docker create --name botan-android-${VERSION} botan-android-${VERSION} docker cp botan-android-${VERSION}:/botan/android docker-builds docker rm -f botan-android-${VERSION} |