[[ Android API 28 ]] Update to use android API 28

livecodeali · livecodeali · commit be57014d0fba · 2019-06-20T08:19:52.000+01:00
This patch changes our build scripts to use or default to android
api 28. It also removes the builders' dependence on the sdk API
version so we can use the same build containers for any sdk API and
only have to update (and rebuild prebuilts) when the ndk changes.
diff --git a/config.py b/config.py
@@ -26,10 +26,10 @@
 BUILDBOT_PLATFORM_TRIPLES = (
     'x86-linux-debian8',
     'x86_64-linux-debian8',
-    'armv7-android-sdk26_ndk16r15',
-    'arm64-android-sdk26_ndk16r15',
-    'x86-android-sdk26_ndk16r15',
-    'x86_64-android-sdk26_ndk16r15',
+    'armv7-android-ndk16r15',
+    'arm64-android-ndk16r15',
+    'x86-android-ndk16r15',
+    'x86_64-android-ndk16r15',
     'universal-mac-macosx10.9', # Minimum deployment target
     'universal-ios-iphoneos12.1',
     'universal-ios-iphoneos11.2',
@@ -611,7 +611,7 @@ def validate_android_tools(opts):
         opts['ANDROID_NDK_PLATFORM_VERSION'] = '16'
 
     if opts['ANDROID_API_VERSION'] is None:
-        opts['ANDROID_API_VERSION'] = '26'
+        opts['ANDROID_API_VERSION'] = '28'
      
     api_ver = opts['ANDROID_API_VERSION']
 
diff --git a/config/android.gypi b/config/android.gypi
@@ -32,7 +32,7 @@
 		'strip':   '<!(echo ${STRIP:-strip})',
 
 		'android_ndk_path%': '<(android_ndk_path)',
-		'android_subplatform%': 'sdk<(android_api_version)_ndk<(android_ndk_platform_version)<(android_ndk_version)',
+		'android_subplatform%': 'ndk<(android_ndk_platform_version)<(android_ndk_version)',
 
 		'android_play_path': '<(android_sdk_path)/extras/google/m2repository/com/google/android/gms',
 	},
diff --git a/docs/development/build-android.md b/docs/development/build-android.md
@@ -82,7 +82,7 @@ AR="${BINDIR}/${TRIPLE}-ar"
 # Android platform information
 ANDROID_NDK_VERSION=r15
 ANDROID_NDK_PLATFORM_VERSION=16
-ANDROID_API_VERSION=26
+ANDROID_API_VERSION=28
 ANDROID_PLATFORM=android-${ANDROID_API_VERSION}
 ANDROID_NDK=${TOOLCHAIN}/android-ndk-${ANDROID_NDK_VERSION}
 ANDROID_SDK=${TOOLCHAIN}/android-sdk-linux
diff --git a/prebuilt/fetch-libraries.sh b/prebuilt/fetch-libraries.sh
@@ -17,7 +17,7 @@ LIBS_emscripten=( Thirdparty ICU )
 
 SUBPLATFORMS_ios=(iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator12.1 iPhoneOS9.2 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS12.1)
 SUBPLATFORMS_win32=(v141_static_debug v141_static_release)
-SUBPLATFORMS_android=(sdk26_ndk16r15)
+SUBPLATFORMS_android=(ndk16r15)
 
 # Fetch settings
 SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
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-26}
+ANDROID_PLATFORM=${ANDROID_PLATFORM:-android-28}
 
 function configureAndroidToolchain {
 	ANDROID_ARCH=$1
