From 643d2116f82d54fd09e17d482c54ea94cabdef72 Mon Sep 17 00:00:00 2001
From: Johnson Ding <johnson.ding@rock-chips.com>
Date: Thu, 7 Jan 2021 18:37:59 +0800
Subject: [PATCH] [build]: support NDK-17 and above

Change-Id: I59bb0a1ad06a3e6d2a2b51610c528ade61e9c5d3
Signed-off-by: Johnson Ding <johnson.ding@rock-chips.com>
---
 build/android/arm/make-Android.bash |  2 +-
 build/android/env_setup.sh          | 25 +++++++++++++++----------
 osal/allocator/allocator_ion.c      |  2 --
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/build/android/arm/make-Android.bash b/build/android/arm/make-Android.bash
index 562daf05..f91ea208 100755
--- a/build/android/arm/make-Android.bash
+++ b/build/android/arm/make-Android.bash
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 BUILD_TYPE="Release"
-ANDROID_ABI="armeabi-v7a"
+ANDROID_ABI="armeabi-v7a with NEON"
 
 #Specify Android NDK path if needed
 #ANDROID_NDK=
diff --git a/build/android/env_setup.sh b/build/android/env_setup.sh
index cf7d8ad9..134ef997 100755
--- a/build/android/env_setup.sh
+++ b/build/android/env_setup.sh
@@ -150,16 +150,21 @@ else
         NATIVE_API_LEVEL="android-21"
     fi
 
-    #################################################
-    # Set platform tools
-    #################################################
-    if [ "${ANDROID_ABI}" = "armeabi-v7a" ]; then
-        TOOLCHAIN_NAME="arm-linux-androideabi-4.9"
-        ANDROID_ABI="armeabi-v7a with NEON"
-        PLATFORM=$ANDROID_NDK/platforms/${NATIVE_API_LEVEL}/arch-arm
-    elif [ "${ANDROID_ABI}" = "arm64-v8a" ]; then
-        TOOLCHAIN_NAME="aarch64-linux-android-4.9"
-        PLATFORM=$ANDROID_NDK/platforms/${NATIVE_API_LEVEL}/arch-arm64
+    if [ $NDK_VERSION -lt 18 ]; then
+        #################################################
+        # Set platform tools
+        #################################################
+        if [ "${ANDROID_ABI}" = "armeabi-v7a" ] || [ "${ANDROID_ABI}" = "armeabi-v7a with NEON" ]; then
+            TOOLCHAIN_NAME="arm-linux-androideabi-4.9"
+            PLATFORM=$ANDROID_NDK/platforms/${NATIVE_API_LEVEL}/arch-arm
+        elif [ "${ANDROID_ABI}" = "arm64-v8a" ]; then
+            TOOLCHAIN_NAME="aarch64-linux-android-4.9"
+            PLATFORM=$ANDROID_NDK/platforms/${NATIVE_API_LEVEL}/arch-arm64
+        fi
+    else
+        # From NDK 18, GCC is deprecated
+        TOOLCHAIN_NAME=""
+        PLATFORM=""
     fi
 fi
 
diff --git a/osal/allocator/allocator_ion.c b/osal/allocator/allocator_ion.c
index e5afae8c..1309e39d 100755
--- a/osal/allocator/allocator_ion.c
+++ b/osal/allocator/allocator_ion.c
@@ -25,8 +25,6 @@
 
 #if defined(ARMLINUX)
 #include <ion.h>
-#elif defined(ANDROID)
-#include <linux/ion.h>
 #else
 #include "ion.h"
 #endif