android-arm: Update NDK to 13b and API to 16

API level 16 still covers the majority of systems:

  https://developer.android.com/about/dashboards/index.html

  https://developer.android.com/ndk/guides/stable_apis.html
This commit is contained in:
Matt McCormick 2016-11-16 15:46:14 -05:00
parent 0d3333a3e1
commit a138f60ab6

View File

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