From 6fb4121ea9ebf3673574b343712e1f7d21a5316f Mon Sep 17 00:00:00 2001
From: "Nadav.Ruskin" <nadav.ruskin@eyesight-tech.com>
Date: Thu, 15 Mar 2018 08:36:06 +0100
Subject: [PATCH 1/5] Android: Use clang

---
 android-arm/Dockerfile      | 1 +
 android-arm/Toolchain.cmake | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/android-arm/Dockerfile b/android-arm/Dockerfile
index 8c7791a..badcfa1 100644
--- a/android-arm/Dockerfile
+++ b/android-arm/Dockerfile
@@ -25,6 +25,7 @@ RUN mkdir -p /build && \
     ./build/tools/make_standalone_toolchain.py \
       --arch arm \
       --api 16 \
+      --stl=libc++ \
       --install-dir=${CROSS_ROOT} && \
     cd / && \
     rm -rf /build && \
diff --git a/android-arm/Toolchain.cmake b/android-arm/Toolchain.cmake
index 713fffa..1399fee 100644
--- a/android-arm/Toolchain.cmake
+++ b/android-arm/Toolchain.cmake
@@ -6,8 +6,8 @@ set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN /usr/${cross_triple}/)
 set(CMAKE_ANDROID_ARM_MODE 1)
 set(CMAKE_ANDROID_ARM_NEON 1)
 
-set(CMAKE_C_COMPILER /usr/${cross_triple}/bin/${cross_triple}-gcc)
-set(CMAKE_CXX_COMPILER /usr/${cross_triple}/bin/${cross_triple}-g++)
+set(CMAKE_C_COMPILER /usr/${cross_triple}/bin/${cross_triple}-clang)
+set(CMAKE_CXX_COMPILER /usr/${cross_triple}/bin/${cross_triple}-clang++)
 
 set(CMAKE_FIND_ROOT_PATH /usr/${cross_triple})
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)

From f8cabb2edbd6281e7f9b61ab5df24c7e585dcdff Mon Sep 17 00:00:00 2001
From: "Nadav.Ruskin" <nadav.ruskin@eyesight-tech.com>
Date: Thu, 15 Mar 2018 08:46:43 +0100
Subject: [PATCH 2/5] Added ANDROID_NDK_API

---
 android-arm/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android-arm/Dockerfile b/android-arm/Dockerfile
index badcfa1..ab02782 100644
--- a/android-arm/Dockerfile
+++ b/android-arm/Dockerfile
@@ -17,6 +17,7 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld
 
 ENV ANDROID_NDK_REVISION 13b
+ENV ANDROID_NDK_API 16
 RUN mkdir -p /build && \
     cd /build && \
     curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
@@ -24,7 +25,7 @@ RUN mkdir -p /build && \
     cd android-ndk-r${ANDROID_NDK_REVISION} && \
     ./build/tools/make_standalone_toolchain.py \
       --arch arm \
-      --api 16 \
+      --api $(ANDROID_NDK_API) \
       --stl=libc++ \
       --install-dir=${CROSS_ROOT} && \
     cd / && \

From e362e021de85bdbd0f87b73fab9dff7aa10d0fea Mon Sep 17 00:00:00 2001
From: Nadav <nadav.ruskin@eyesight-tech.com>
Date: Thu, 15 Mar 2018 10:27:46 +0200
Subject: [PATCH 3/5] Update Dockerfile

---
 android-arm/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-arm/Dockerfile b/android-arm/Dockerfile
index ab02782..948569e 100644
--- a/android-arm/Dockerfile
+++ b/android-arm/Dockerfile
@@ -25,7 +25,7 @@ RUN mkdir -p /build && \
     cd android-ndk-r${ANDROID_NDK_REVISION} && \
     ./build/tools/make_standalone_toolchain.py \
       --arch arm \
-      --api $(ANDROID_NDK_API) \
+      --api ${ANDROID_NDK_API} \
       --stl=libc++ \
       --install-dir=${CROSS_ROOT} && \
     cd / && \

From 71dfbcc5095de47d97d0ddfcf227e607471774f8 Mon Sep 17 00:00:00 2001
From: Nadav <nadav.ruskin@eyesight-tech.com>
Date: Sun, 18 Mar 2018 11:10:47 +0200
Subject: [PATCH 4/5] Update Dockerfile

---
 android-arm/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-arm/Dockerfile b/android-arm/Dockerfile
index 948569e..5ce348f 100644
--- a/android-arm/Dockerfile
+++ b/android-arm/Dockerfile
@@ -16,7 +16,7 @@ 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 13b
+ENV ANDROID_NDK_REVISION 16b
 ENV ANDROID_NDK_API 16
 RUN mkdir -p /build && \
     cd /build && \

From f8e034ee01a6fdc87aba1bef72a8af5c1bf6ffbd Mon Sep 17 00:00:00 2001
From: Nadav <nadav.ruskin@eyesight-tech.com>
Date: Wed, 28 Mar 2018 11:43:22 +0300
Subject: [PATCH 5/5] Update Dockerfile

---
 android-arm/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android-arm/Dockerfile b/android-arm/Dockerfile
index 5ce348f..9a28c15 100644
--- a/android-arm/Dockerfile
+++ b/android-arm/Dockerfile
@@ -11,9 +11,9 @@ ENV CROSS_TRIPLE=arm-linux-androideabi
 ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
-    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
+    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
     CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
-    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \
+    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
     LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld
 
 ENV ANDROID_NDK_REVISION 16b