package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-13 12:53:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[build]: support NDK-17 and above

Browse Source 
Change-Id: I59bb0a1ad06a3e6d2a2b51610c528ade61e9c5d3
Signed-off-by: Johnson Ding <johnson.ding@rock-chips.com>
This commit is contained in:
Johnson Ding
2021-01-07 18:37:59 +08:00
committed by Herman Chen
parent 5f748ee931
commit 643d2116f8
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/android/arm/make-Android.bash
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
BUILD_TYPE="Release" BUILD_TYPE="Release"
ANDROID_ABI="armeabi-v7a" ANDROID_ABI="armeabi-v7a with NEON"
#Specify Android NDK path if needed #Specify Android NDK path if needed
#ANDROID_NDK= #ANDROID_NDK=

9
build/android/env_setup.sh
View File

@@ -150,17 +150,22 @@ else
NATIVE_API_LEVEL="android-21" NATIVE_API_LEVEL="android-21"
fi fi
if [ $NDK_VERSION -lt 18 ]; then
################################################# #################################################
# Set platform tools # Set platform tools
################################################# #################################################
if [ "${ANDROID_ABI}" = "armeabi-v7a" ]; then if [ "${ANDROID_ABI}" = "armeabi-v7a" ] || [ "${ANDROID_ABI}" = "armeabi-v7a with NEON" ]; then
TOOLCHAIN_NAME="arm-linux-androideabi-4.9" TOOLCHAIN_NAME="arm-linux-androideabi-4.9"
ANDROID_ABI="armeabi-v7a with NEON"
PLATFORM=$ANDROID_NDK/platforms/${NATIVE_API_LEVEL}/arch-arm PLATFORM=$ANDROID_NDK/platforms/${NATIVE_API_LEVEL}/arch-arm
elif [ "${ANDROID_ABI}" = "arm64-v8a" ]; then elif [ "${ANDROID_ABI}" = "arm64-v8a" ]; then
TOOLCHAIN_NAME="aarch64-linux-android-4.9" TOOLCHAIN_NAME="aarch64-linux-android-4.9"
PLATFORM=$ANDROID_NDK/platforms/${NATIVE_API_LEVEL}/arch-arm64 PLATFORM=$ANDROID_NDK/platforms/${NATIVE_API_LEVEL}/arch-arm64
fi fi
else
# From NDK 18, GCC is deprecated
TOOLCHAIN_NAME=""
PLATFORM=""
fi
fi fi
if [ "${FOUND_NDK}" = "0" ]; then if [ "${FOUND_NDK}" = "0" ]; then

2
osal/allocator/allocator_ion.c
View File

@@ -25,8 +25,6 @@
#if defined(ARMLINUX) #if defined(ARMLINUX)
#include <ion.h> #include <ion.h>
#elif defined(ANDROID)
#include <linux/ion.h>
#else #else
#include "ion.h" #include "ion.h"
#endif #endif