diff options
| author | Mike Beattie <mike@ethernal.org> | 2013-03-10 20:24:56 +1300 |
|---|---|---|
| committer | Mike Beattie <mike@ethernal.org> | 2013-03-10 20:24:56 +1300 |
| commit | 8adadf6bd2ba623642675e4beafac4ac98b1916d (patch) | |
| tree | adbf43c5435ffede5d053356d51e8db399fb9d9f | |
| parent | d029acad6a992be9b7b4498e70605f8a1e1a4ef6 (diff) | |
| parent | 0c0c6d60cdce39582fa5350e9b016a08e76f27a1 (diff) | |
Merge branch 'master' into altosdroid
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | altosdroid/Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 46 |
3 files changed, 47 insertions, 5 deletions
@@ -30,6 +30,7 @@ ao-tools/ao-bitbang/ao-bitbang ao-tools/ao-dbg/ao-dbg ao-tools/ao-dumplog/ao-dumplog ao-tools/ao-eeprom/ao-eeprom +ao-tools/ao-edit-telem/ao-edit-telem ao-tools/ao-list/ao-list ao-tools/ao-load/ao-load ao-tools/ao-postflight/ao-postflight diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am index 3dbabdd7..0473c17a 100644 --- a/altosdroid/Makefile.am +++ b/altosdroid/Makefile.am @@ -80,7 +80,7 @@ release: bin/AltosDroid-release-unsigned.apk bin/AltosDroid-release-signed.apk \ bin/AltosDroid-release.apk -clean: $(GOOGLE_PLAY_SERVICES_LIB) +clean-local: $(GOOGLE_PLAY_SERVICES_LIB) ant clean rm -rf $(EXT_LIBDIR) rm -f $(DRAWABLES) @@ -88,7 +88,8 @@ clean: $(GOOGLE_PLAY_SERVICES_LIB) else -clean: +clean-local: endif +clean: clean-local diff --git a/configure.ac b/configure.ac index f9a892df..977678f3 100644 --- a/configure.ac +++ b/configure.ac @@ -86,10 +86,8 @@ AC_ARG_WITH(android, AS_HELP_STRING([--with-android=PATH], [Set android SDK path (default searches in a variety of places)]), [ANDROID_SDK=$withval], [ANDROID_SDK=${ANDROID_SDK:-auto}]) -echo ANDROID_SDK set to $ANDROID_SDK - if test "x$ANDROID_SDK" = "xauto"; then - AC_MSG_CHECKING([Android SDK files]) + AC_MSG_CHECKING([Android SDK]) for sdk in ../android/android-sdk-linux ../android/android-sdk ../android-sdk ../android-sdk-linux $HOME/android; do if test "x$ANDROID_SDK" = "xauto"; then SDK="$sdk" @@ -104,6 +102,48 @@ if test "x$ANDROID_SDK" = "xauto"; then fi AC_MSG_RESULT([$ANDROID_SDK]) fi +if test "x$ANDROID_SDK" != "xno"; then + AC_MSG_CHECKING([Android SDK version]) + SDK_VERSION=`grep -i '^Pkg.Revision=' $ANDROID_SDK/tools/source.properties | cut -f2- -d= | sed s/^r//` + SDK_MAJOR_VERSION="`echo $SDK_VERSION | sed 's/[[^0-9]].*//'`" + if test "$SDK_MAJOR_VERSION" -lt 17 ; then + AC_MSG_NOTICE([SDK version $SDK_VERSION is too old. Need >= r17]) + ANDROID_SDK=no + else + AC_MSG_RESULT([$SDK_VERSION]) + fi +fi +if test "x$ANDROID_SDK" != "xno"; then + AC_MSG_CHECKING([Android SDK API Level]) + if test -f "$ANDROID_SDK/platforms/android-10/source.properties"; then + API_LEVEL=`sed -ne 's/^AndroidVersion.ApiLevel=//p' $ANDROID_SDK/platforms/android-10/source.properties` + if test "$API_LEVEL" = "10"; then + AC_MSG_RESULT([$API_LEVEL]) + else + AC_MSG_NOTICE([API Level 10 not installed correctly.]) + ANDROID_SDK=no + fi + else + AC_MSG_NOTICE([API Level 10 not installed, but is required.]) + ANDROID_SDK=no + fi +fi +if test "x$ANDROID_SDK" != "xno"; then + AC_MSG_CHECKING([Android SDK required extras]) + if test -f "$ANDROID_SDK/extras/android/support/source.properties"; then + ANDROID_SUPPORT_LIB_NAME=`sed -ne 's/^Extra.NameDisplay=//p' $ANDROID_SDK/extras/android/support/source.properties` + if test -f "$ANDROID_SDK/extras/google/google_play_services/source.properties"; then + GOOGLE_PLAY_SERVICES_NAME=`sed -ne 's/^Extra.NameDisplay=//p' $ANDROID_SDK/extras/google/google_play_services/source.properties` + AC_MSG_RESULT([$ANDROID_SUPPORT_LIB_NAME, $GOOGLE_PLAY_SERVICES_NAME]) + else + AC_MSG_NOTICE([Google Play Services library not installed.]) + ANDROID_SDK=no + fi + else + AC_MSG_NOTICE([Android Support Library not installed.]) + ANDROID_SDK=no + fi +fi AM_CONDITIONAL([ANDROID], [test x$ANDROID_SDK != xno]) |