From 5ca4118451a38a8fa1e876fd5416028010ec218b Mon Sep 17 00:00:00 2001
From: Liu Yiqun <liuyiqun01@baidu.com>
Date: Tue, 22 Aug 2017 17:27:04 +0800
Subject: [PATCH] Update Dockerfile of android to support building for
 arm64-v8a and armeabi.

---
 Dockerfile.android                     | 18 ++++---
 paddle/scripts/docker/build_android.sh | 65 +++++++++++++++++++-------
 2 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/Dockerfile.android b/Dockerfile.android
index c0fa58c384f..aa95abb3661 100644
--- a/Dockerfile.android
+++ b/Dockerfile.android
@@ -4,9 +4,15 @@ MAINTAINER PaddlePaddle Authors <paddle-dev@baidu.com>
 ARG UBUNTU_MIRROR
 RUN /bin/bash -c 'if [[ -n ${UBUNTU_MIRROR} ]]; then sed -i 's#http://archive.ubuntu.com/ubuntu#${UBUNTU_MIRROR}#g' /etc/apt/sources.list; fi'
 
+# ENV variables
+ARG ANDROID_ABI
+
+ENV ANDROID_ABI=${ANDROID_ABI:-"armeabi-v7a"}
+
 ENV HOME=/root \
     ANDROID_NDK_HOME=/opt/android-ndk-linux \
-    ANDROID_STANDALONE_TOOLCHAIN=/opt/android-toolchain-gcc
+    ANDROID_ARM_STANDALONE_TOOLCHAIN=/opt/arm-toolchain-gcc \
+    ANDROID_ARM64_STANDALONE_TOOLCHAIN=/opt/arm64-toolchain-gcc
 
 RUN apt-get update && \
     apt-get install -y \
@@ -15,12 +21,11 @@ RUN apt-get update && \
     apt-get clean -y
 
 # Install Go and glide
-RUN wget -O go.tgz https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf go.tgz && \
+RUN wget -qO- go.tgz https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz | \
+    tar -xz -C /usr/local && \
     mkdir /root/gopath && \
     mkdir /root/gopath/bin && \
-    mkdir /root/gopath/src && \
-    rm go.tgz
+    mkdir /root/gopath/src
 ENV GOROOT=/usr/local/go GOPATH=/root/gopath
 # should not be in the same line with GOROOT definition, otherwise docker build could not find GOROOT.
 ENV PATH=${PATH}:${GOROOT}/bin:${GOPATH}/bin
@@ -42,7 +47,8 @@ RUN mkdir /opt/android-ndk-tmp && \
     wget -q https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip && \
     unzip -q android-ndk-r14b-linux-x86_64.zip && \
     mv android-ndk-r14b ${ANDROID_NDK_HOME} && \
-    ${ANDROID_NDK_HOME}/build/tools/make-standalone-toolchain.sh --arch=arm --platform=android-21 --install-dir=${ANDROID_STANDALONE_TOOLCHAIN} && \
+    ${ANDROID_NDK_HOME}/build/tools/make-standalone-toolchain.sh --arch=arm --platform=android-21 --install-dir=${ANDROID_ARM_STANDALONE_TOOLCHAIN} && \
+    ${ANDROID_NDK_HOME}/build/tools/make-standalone-toolchain.sh --arch=arm64 --platform=android-21 --install-dir=${ANDROID_ARM64_STANDALONE_TOOLCHAIN} && \
     rm -rf /opt/android-ndk-tmp && \
     rm -rf ${ANDROID_NDK_HOME}
 
diff --git a/paddle/scripts/docker/build_android.sh b/paddle/scripts/docker/build_android.sh
index 5584e29e2a1..593ae28e495 100644
--- a/paddle/scripts/docker/build_android.sh
+++ b/paddle/scripts/docker/build_android.sh
@@ -2,22 +2,55 @@
 
 set -xe
 
-mkdir -p /paddle/build_android
-cd /paddle/build_android
+mkdir -p /paddle/build_android/$ANDROID_ABI
+cd /paddle/build_android/$ANDROID_ABI
 rm -rf /paddle/install 2>/dev/null || true
-cmake -DCMAKE_SYSTEM_NAME=Android \
-      -DANDROID_STANDALONE_TOOLCHAIN=$ANDROID_STANDALONE_TOOLCHAIN \
-      -DANDROID_ABI=armeabi-v7a \
-      -DANDROID_ARM_NEON=ON \
-      -DANDROID_ARM_MODE=ON \
-      -DHOST_C_COMPILER=/usr/bin/gcc \
-      -DHOST_CXX_COMPILER=/usr/bin/g++ \
-      -DCMAKE_INSTALL_PREFIX=/paddle/install \
-      -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-      -DCMAKE_C_FLAGS_RELWITHDEBINFO="-O3" \
-      -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O3" \
-      -DWITH_C_API=ON \
-      -DWITH_SWIG_PY=OFF \
-      ..
+
+THIRD_PARTY_PATH=/paddle/third_party_android/$ANDROID_ABI
+
+if [ $ANDROID_ABI == "armeabi-v7a" ]; then
+  cmake -DCMAKE_SYSTEM_NAME=Android \
+        -DANDROID_STANDALONE_TOOLCHAIN=$ANDROID_ARM_STANDALONE_TOOLCHAIN \
+        -DANDROID_ABI=$ANDROID_ABI \
+        -DANDROID_ARM_NEON=ON \
+        -DANDROID_ARM_MODE=ON \
+        -DHOST_C_COMPILER=/usr/bin/gcc \
+        -DHOST_CXX_COMPILER=/usr/bin/g++ \
+        -DCMAKE_INSTALL_PREFIX=/paddle/install \
+        -DTHIRD_PARTY_PATH=$THIRD_PARTY_PATH \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DWITH_C_API=ON \
+        -DWITH_SWIG_PY=OFF \
+        /paddle
+elif [ $ANDROID_ABI == "arm64-v7a" ]; then
+  cmake -DCMAKE_SYSTEM_NAME=Android \
+        -DANDROID_STANDALONE_TOOLCHAIN=$ANDROID_ARM64_STANDALONE_TOOLCHAIN \
+        -DANDROID_ABI=$ANDROID_ABI \
+        -DANDROID_ARM_MODE=ON \
+        -DHOST_C_COMPILER=/usr/bin/gcc \
+        -DHOST_CXX_COMPILER=/usr/bin/g++ \
+        -DCMAKE_INSTALL_PREFIX=/paddle/install \
+        -DTHIRD_PARTY_PATH=$THIRD_PARTY_PATH \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DWITH_C_API=ON \
+        -DWITH_SWIG_PY=OFF \
+        /paddle
+elif [ $ANDROID_ABI == "armeabi" ]; then
+  cmake -DCMAKE_SYSTEM_NAME=Android \
+        -DANDROID_STANDALONE_TOOLCHAIN=$ANDROID_ARM_STANDALONE_TOOLCHAIN \
+        -DANDROID_ABI=$ANDROID_ABI \
+        -DANDROID_ARM_MODE=ON \
+        -DHOST_C_COMPILER=/usr/bin/gcc \
+        -DHOST_CXX_COMPILER=/usr/bin/g++ \
+        -DCMAKE_INSTALL_PREFIX=/paddle/install \
+        -DTHIRD_PARTY_PATH=$THIRD_PARTY_PATH \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DWITH_C_API=ON \
+        -DWITH_SWIG_PY=OFF \
+        /paddle
+else
+  echo "Invalid ANDROID_ABI: $ANDROID_ABI"
+fi
+
 make -j `nproc`
 make install -j `nproc`
-- 
GitLab