Added check_android_platform.

2 files changed, 13 insertions, 2 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 362cc779d533..9bf141a24458 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=android-environment
 pkgver=2
-pkgrel=1
+pkgrel=2
 pkgdesc='Script providing common environment variables and functions for Android builds.'
 arch=('any')
 url='https://aur.archlinux.org/packages/android-evironment'
diff --git a/android-env.sh b/android-env.sh
index b07ccf5a2ed8..7665a2ea4d98 100755
--- a/android-env.sh
+++ b/android-env.sh
@@ -41,6 +41,7 @@ if [ -z "${ANDROID_NDK_PLATFORM}" ]; then
     export ANDROID_NDK_PLATFORM=android-$ANDROID_MINIMUM_PLATFORM
 fi
 
+export ANDROID_SDK_PLATFORM=${ANDROID_HOME}/platforms/$ANDROID_API_VERSION
 export ANDROID_PLATFORM=${ANDROID_NDK_HOME}/platforms/$ANDROID_NDK_PLATFORM
 export ANDROID_TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64
 export ANDROID_SYSROOT=${ANDROID_TOOLCHAIN}/sysroot
@@ -104,7 +105,17 @@ check_ndk_version_ge_than() {
     if [ "${older_ver}" = "${ndk_ver}" ]; then
         echo "ERROR: NDK version >= $version required."
 
-        return 1
+        return -1
+    fi
+
+    return 0
+}
+
+check_android_platform() {
+    if [ ! -e "${ANDROID_SDK_PLATFORM}/source.properties" ]; then
+        echo "ERROR: Please, install android-platform-${ANDROID_MINIMUM_PLATFORM}."
+
+        return -1
     fi
 
     return 0