diff --git a/android-arm/Dockerfile b/android-arm/Dockerfile index 9d7a589..d4e9e29 100644 --- a/android-arm/Dockerfile +++ b/android-arm/Dockerfile @@ -4,7 +4,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # The cross-compiling emulator RUN apt-get update && apt-get install -y \ qemu-user \ - qemu-user-static + qemu-user-static \ + unzip ENV CROSS_TRIPLE=arm-linux-androideabi ENV CROSS_ROOT=/usr/${CROSS_TRIPLE} @@ -15,18 +16,15 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \ CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \ LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld -ENV ANDROID_NDK_REVISION 10e +ENV ANDROID_NDK_REVISION 13b RUN mkdir -p /build && \ cd /build && \ - curl -O http://dl.google.com/android/ndk/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.bin && \ - chmod +x ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.bin && \ - ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.bin && \ - cd /build/android-ndk-r${ANDROID_NDK_REVISION} && \ - /bin/bash ./build/tools/make-standalone-toolchain.sh \ - --arch=arm \ - --system=linux-x86_64 \ - --ndk-dir=/build/android-ndk-r${ANDROID_NDK_REVISION} \ - --platform=android-14 \ + curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \ + unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \ + cd android-ndk-r${ANDROID_NDK_REVISION} && \ + ./build/tools/make_standalone_toolchain.py \ + --arch arm \ + --api 16 \ --install-dir=${CROSS_ROOT} && \ cd / && \ rm -rf /build && \