Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1352015 - Part 1: Fix Android SDK configure checks. r=nalexander

Browse Source 
It's the *compile*SdkVersion that needs to match the installed Android SDK plat-
form in order to be able to build an app, whereas the *target*SdkVersion is
merely a compatibility flag.

Since the received wisdom is that targetSdkVersion should be <= compileSdk-
Version and Android Studio is also showing a warning to that effect if you
modify the build.gradle of a small sample app accordingly, I've also added a
corresponding configure check of our own to enforce this.

MozReview-Commit-ID: F2RZemChFrm

--HG--
extra : rebase_source : cf4f6256baa4446d673b94d97f9497f93d7917ff
This commit is contained in:
Jan Henning 2018-05-06 20:39:11 +02:00
parent 689c7bd641
commit 47d4c1bcf7
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build/autoconf/android.m4
View File

@ -117,14 +117,19 @@ case "$target" in
AC_MSG_ERROR([Including platforms/android-* in --with-android-sdk arguments is deprecated. Use --with-android-sdk=$android_sdk_root.])
fi
android_target_sdk=$2
AC_MSG_CHECKING([for Android SDK platform version $android_target_sdk])
android_sdk=$android_sdk_root/platforms/android-$android_target_sdk
android_compile_sdk=$1
AC_MSG_CHECKING([for Android SDK platform version $android_compile_sdk])
android_sdk=$android_sdk_root/platforms/android-$android_compile_sdk
if ! test -e "$android_sdk/source.properties" ; then
AC_MSG_ERROR([You must download Android SDK platform version $android_target_sdk. Try |mach bootstrap|. (Looked for $android_sdk)])
AC_MSG_ERROR([You must download Android SDK platform version $android_compile_sdk. Try |mach bootstrap|. (Looked for $android_sdk)])
fi
AC_MSG_RESULT([$android_sdk])
android_target_sdk=$2
if test $android_compile_sdk -lt $android_target_sdk ; then
AC_MSG_ERROR([Android compileSdkVersion ($android_compile_sdk) should not be smaller than targetSdkVersion ($android_target_sdk).])
fi
AC_MSG_CHECKING([for Android build-tools])
android_build_tools_base="$android_sdk_root"/build-tools
android_build_tools_version=""
@ -175,9 +180,7 @@ case "$target" in
AC_MSG_ERROR([The program emulator was not found. Try |mach bootstrap|.])
fi
# `compileSdkVersion ANDROID_COMPILE_SDK_VERSION` is Gradle-only,
# so there's no associated configure check.
ANDROID_COMPILE_SDK_VERSION=$1
ANDROID_COMPILE_SDK_VERSION="${android_compile_sdk}"
ANDROID_TARGET_SDK="${android_target_sdk}"
ANDROID_SDK="${android_sdk}"
ANDROID_SDK_ROOT="${android_sdk_root}"