Update the android ndk version to 21. (#6318)

openframeworks · Jul 1, 2019 · 97b291e · 97b291e
1 parent 37ea29f
commit 97b291e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/libs/openFrameworksCompiled/project/android/build.gradle b/libs/openFrameworksCompiled/project/android/build.gradle
@@ -18,7 +18,7 @@ model {
         }
 
         ndk {
-            platformVersion = "19"
+            platformVersion = "21"
             moduleName "openFrameworksLib"
             toolchain  = buildToolchain()
             stl        = compilerStl()

diff --git a/libs/openFrameworksCompiled/project/android/common-functions.gradle b/libs/openFrameworksCompiled/project/android/common-functions.gradle
@@ -260,7 +260,7 @@ def getFlavorName(abi) {
 }
 
 def getAbis(){
-    return ["armeabi-v7a", "x86"]
+    return ["arm64-v8a", "armeabi-v7a", "x86"]
 }
 
 def ofAppModuleName(){

diff --git a/scripts/dev/download_libs.sh b/scripts/dev/download_libs.sh
@@ -19,7 +19,7 @@ cat << EOF
                                     vs2015: 32 or 64
                                     vs2017: 32 or 64
                                     msys2: 32
-                                    android: armv7 or x86 (if not specified will download both)
+                                    android: armv7, arm64, and x86 (if not specified will download all)
                                     linux: 64gcc4, 64gcc5, 64gcc6 / 64, armv6l or armv7l
     -n, --no-overwrite          Merge new libraries with exisiting ones, use only to download same version for different platforms
                                 If not set deletes any existing libraries
@@ -172,6 +172,7 @@ elif [ "$ARCH" == "" ] && [[ "$PLATFORM" == "osx" || "$PLATFORM" == "ios" || "$P
           openFrameworksLibs_${VER}_${PLATFORM}4.tar.bz2"
 elif [ "$ARCH" == "" ] && [ "$PLATFORM" == "android" ]; then
     PKGS="openFrameworksLibs_${VER}_${PLATFORM}armv7.tar.bz2 \
+          openFrameworksLibs_${VER}_${PLATFORM}arm64.tar.bz2 \
           openFrameworksLibs_${VER}_${PLATFORM}x86.tar.bz2"
 else # Linux
     PKGS="openFrameworksLibs_${VER}_${PLATFORM}${ARCH}.tar.bz2"

diff --git a/scripts/templates/android/build.gradle b/scripts/templates/android/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.model.application'
 
 model {
     android {
-        // openFrameworks currently only supports compiling against SDK 19
+        // openFrameworks currently only supports compiling against SDK 19 or nweer
         compileSdkVersion = 25
         buildToolsVersion = "25.0.3"
 
@@ -41,7 +41,7 @@ model {
         moduleName = ofAppModuleName()
         toolchain  = buildToolchain()
         stl        = compilerStl()
-        platformVersion = "19"
+        platformVersion = "21"
     }
 
     android.sources {