[[ Android SDK ]] Update to compile against android API 26

livecodeali · livecodeali · commit 76f00d2aa343 · 2018-06-11T09:58:59.000+01:00
diff --git a/config.py b/config.py
@@ -25,7 +25,7 @@
 BUILDBOT_PLATFORM_TRIPLES = (
     'x86-linux-debian8',
     'x86_64-linux-debian8',
-    'armv6-android-api9',
+    'armv6-android-api26',
     'universal-mac-macosx10.9', # Minimum deployment target
     'universal-ios-iphoneos11.4',
     'universal-ios-iphoneos11.2',
@@ -412,11 +412,11 @@ def guess_android_build_tools(sdkdir):
 
 def validate_android_tools(opts):
     if opts['ANDROID_NDK_VERSION'] is None:
-        opts['ANDROID_NDK_VERSION'] = 'r14'
+        opts['ANDROID_NDK_VERSION'] = 'r17'
 
     ndk_ver = opts['ANDROID_NDK_VERSION']
     if opts['ANDROID_PLATFORM'] is None:
-        opts['ANDROID_PLATFORM'] = 'android-17'
+        opts['ANDROID_PLATFORM'] = 'android-26'
 
     if opts['ANDROID_NDK'] is None:
         ndk = guess_android_tooldir('android-ndk')
diff --git a/docs/development/build-android.md b/docs/development/build-android.md
@@ -22,10 +22,10 @@ Extract both the NDK and SDK to a suitable directory, e.g. `~/android/toolchain`
 mkdir -p ~/android/toolchain/android-sdk-linux
 cd ~/android/toolchain
 
-wget https://dl.google.com/android/repository/android-ndk-r14-linux-x86_64.zip
+wget https://dl.google.com/android/repository/android-ndk-r17-linux-x86_64.zip
 wget https://dl.google.com/android/repository/tools_r25.2.3-linux.zip
 
-unzip android-ndk-r14-linux-x86_64.zip
+unzip android-ndk-r17-linux-x86_64.zip
 
 pushd android-sdk-linux
 unzip tools_r25.2.3-linux.zip
@@ -41,19 +41,15 @@ Update the SDK:
 Create a standalone toolchain (this simplifies setting up the build environment):
 
 ````bash
-android-ndk-r14/build/tools/make_standalone_toolchain.py \
-    --arch arm --api 9 \
+android-ndk-r17/build/tools/make_standalone_toolchain.py \
+    --arch arm --api 26 \
     --install-dir ${HOME}/android/toolchain/standalone
 ````
 
-**Note:** We currently use NDK API 9 for building the LiveCode Android engine and
-do not specify the '--stl' option as we currently require the C++ library (if used)
-to be statically linked into the executable.
-
 Add a couple of symlinks to allow the engine configuration script to find the Android toolchain:
 
 ````bash
-ln -s android-ndk-r14 android-ndk
+ln -s android-ndk-r17 android-ndk
 ln -s android-sdk-linux android-sdk
 ````
 
@@ -84,11 +80,11 @@ LINK="${BINDIR}/${TRIPLE}-clang ${COMMON_FLAGS} -fuse-ld=bfd"
 AR="${BINDIR}/${TRIPLE}-ar"
 
 # Android platform information
-ANDROID_NDK_VERSION=r14
-ANDROID_PLATFORM=android-17
-ANDROID_NDK=${TOOLCHAIN}/android-ndk-r14
+ANDROID_NDK_VERSION=r17
+ANDROID_PLATFORM=android-26
+ANDROID_NDK=${TOOLCHAIN}/android-ndk-r17
 ANDROID_SDK=${TOOLCHAIN}/android-sdk-linux
-ANDROID_BUILD_TOOLS=25.0.2
+ANDROID_BUILD_TOOLS=27.0.3
 ANDROID_LIB_PATH=${TOOLCHAIN}/standalone/${TRIPLE}/lib
 
 export JAVA_SDK
diff --git a/ide-support/revdeploylibraryandroid.livecodescript b/ide-support/revdeploylibraryandroid.livecodescript
@@ -179,7 +179,7 @@ function deployIsValidJDK pPath
 end deployIsValidJDK
 
 function deployRequiredSDK
-   return "Android 4.0.3 (API 15)"
+   return "Android 8.0 (API 26)"
 end deployRequiredSDK
 
 function deployIsValidSDK pPath 
@@ -190,10 +190,8 @@ function deployIsValidSDK pPath
       return false
    end if
    
-   // We need API 15 in order to be able to give the value 'screenSize' to the manifest variable configChanges
-   // That was introduced in the API 13, but the SDK manager only have API 15 nowadays
-   if there is no folder (pPath & slash & "platforms/android-15") then
-      --return "could not find install of SDK level 8, make sure it has been installed with the Android SDK Manager"
+   if there is no folder (pPath & slash & "platforms/android-26") then
+      --return "could not find install of SDK level 26, make sure it has been installed with the Android SDK Manager"
       return false
    end if
    
@@ -326,7 +324,7 @@ function pathToRootClasses pRoot
    if pRoot is empty then
       put sAndroidRoot into pRoot
    end if
-   return pRoot & slash & "platforms/android-15/android.jar"
+   return pRoot & slash & "platforms/android-26/android.jar"
 end pathToRootClasses
 
 function pathToSDKClasses pRoot
diff --git a/prebuilt/scripts/android.inc b/prebuilt/scripts/android.inc
@@ -1,6 +1,6 @@
 # Android options
 ANDROID_NDK=${ANDROID_NDK:-"${HOME}/android/toolchain/android-ndk"}
-ANDROID_PLATFORM=${ANDROID_PLATFORM:-android-17}
+ANDROID_PLATFORM=${ANDROID_PLATFORM:-android-26}
 
 # Has a full, custom toolchain been specified?
 #  AR, CC, CXX, LINK, OBJCOPY, RANLIB, STRIP
