update NDK version to r21.4.7075529 LTS, validated on arm64 target only!

zhouwg · Jul 3, 2021 · b67fff3 · b67fff3
1 parent 0e30bd2
commit b67fff3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -94,7 +94,7 @@ autocmd InsertEnter * match ForbiddenWhitespace /\t\|\s\+\%#\@<!$/
 ```
 
 
-- [Android NDK-r14b](https://developer.android.com/ndk/downloads/older_releases)
+- [Android NDK-r21e(LTS)](https://developer.android.com/ndk/downloads)
 - [Android Studio 4.2.1](https://developer.android.google.cn/studio)
 - [Gradle 6.6.1](https://gradle.org/releases)
 
@@ -108,13 +108,12 @@ git checkout kantv
 
 # add these lines to your ~/.bash_profile or ~/.profile
 # export ANDROID_SDK=<your sdk path>
-# ndk-r14b was used in this project
-# export ANDROID_NDK=<your ndk path>/android-ndk-r14b
+# ndk-r21e was used in this project, if you intall from SDK Manager
+# export ANDROID_NDK=<your sdk path>/sdk/ndk/21.4.7075529
 
 # add these line to ./android/ijkplayer/local.properties
 
 sdk.dir=<your sdk path>
-ndk.dir=<your ndk path>/android-ndk-r14b
 
 ```
 

diff --git a/android/ijkplayer/build.gradle b/android/ijkplayer/build.gradle
@@ -25,10 +25,11 @@ allprojects {
 }
 
 ext {
-    compileSdkVersion = 25
-    buildToolsVersion = "25.0.3"
+    compileSdkVersion = 28
+    buildToolsVersion = "28.0.3"
 
-    targetSdkVersion = 25
+    targetSdkVersion = 28
+	minSdkVersion = 21
 
     versionCode = 000400
     versionName = "0.0.4"

diff --git a/android/ijkplayer/kantv/build.gradle b/android/ijkplayer/kantv/build.gradle
@@ -16,7 +16,7 @@ android {
     }
     defaultConfig {
         applicationId "tv.danmaku.ijk.kantv"
-        minSdkVersion 9
+        minSdkVersion 21
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName

diff --git a/build-all-native-libs.sh b/build-all-native-libs.sh
@@ -39,8 +39,8 @@ function setup_env()
     export HOME_PATH=$(env | grep ^HOME= | cut -c 6-)
     export PROJECT_NAME=ijkplayer
     export PROJECT_ROOT_PATH=$(pwd)
-    #ndk-r14b must be used in this project but I guess clang mightbe ok
-	export ANDROID_NDK=${ANDROID_NDK:-/opt/android-ndk-r14b}
+    # ndk must be used in this project
+    export ANDROID_NDK=${ANDROID_NDK:-/opt/android-ndk-r21.4.7075529}
     export XCODE_SELECT=/usr/bin/xcode-select
     #TODO:better idea to get real cpu counts in macOS
     export HOST_CPU_COUNTS=4

diff --git a/ijkmedia/ijkplayer/Android.mk b/ijkmedia/ijkplayer/Android.mk
@@ -26,7 +26,6 @@ include $(CLEAR_VARS)
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 LOCAL_CFLAGS += -mfloat-abi=soft
 endif
-LOCAL_CFLAGS += -std=c99
 LOCAL_LDLIBS += -lz -lm -llog -landroid
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)

diff --git a/ijkmedia/ijksdl/Android.mk b/ijkmedia/ijksdl/Android.mk
@@ -20,7 +20,6 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_CFLAGS += -std=c99
 LOCAL_LDLIBS += -llog -landroid -lOpenSLES -lEGL -lGLESv2
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)