Update:CI:Importing Jan's settings for android build

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6067 ffa7fe5e-494d-0410-b361-a75ebd5db220

2 files changed, 22 insertions, 19 deletions

diff --git a/ci/build_android.sh b/ci/build_android.sh
index ab0b88de9..98936fa81 100644
--- a/ci/build_android.sh
+++ b/ci/build_android.sh
@@ -23,16 +23,16 @@ export ANDROID_BUILD_TOOLS="21.1.2"
 export ANDROID_BUILD_CHECK=$ANDROID_SDK"/build-tools/"$BUILD_TOOLS
 
 export ANDROID_PLATFORM_LATEST="android-21"
-export ANDROID_PLATFORM_MIN="android-10"
+export ANDROID_PLATFORM_MIN="android-7"
 export ANDROID_PLATFORM_CHECK_MIN=$ANDROID_SDK"/platforms/"$ANDROID_PLATFORM_MIN"/images"
 export ANDROID_PLATFORM_CHECK_MAX=$ANDROID_SDK"/platforms/"$ANDROID_PLATFORM_LATEST"/images"
 
 export BUILD_PATH=$START_PATH"/android-build"
 export ANDROID_ENV=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS
 
-export SDK_ADD_FILTER="platform-tool,tools,build-tools-21.1.2,extra-android-m2repository,extra-android-support,android-10,sysimg-10,addon-google_apis-google-10,android-9,addon-google_apis-google-9,android-21,sysimg-21,addon-google_apis-google-21"
+export SDK_ADD_FILTER="platform-tool,tools,build-tools-21.0.1,extra-android-m2repository,extra-android-support,android-10,sysimg-10,addon-google_apis-google-10,android-9,addon-google_apis-google-9,android-21,sysimg-21,addon-google_apis-google-21"
 
-export SDK_UPD_FILTER="platform-tool,tools,build-tools-21.1.2,extra-android-m2repository,extra-android-support"
+export SDK_UPD_FILTER="platform-tool,tools,build-tools-21.0.1,extra-android-m2repository,extra-android-support"
 
 mkdir $ANDROID_HOME
 
@@ -106,11 +106,11 @@ fi
 # $ADD_SDK
 #}
 #
-#function updateSDK {
-#  export UPD_SDK="echo y|android update sdk --no-ui --filter $SDK_UPD_FILTER"
-#echo $UPD_SDK
-#  $UPD_SDK
-#}
+function updateSDK {
+  export UPD_SDK="echo y|android update sdk --no-ui --filter $SDK_UPD_FILTER"
+echo $UPD_SDK
+  $UPD_SDK
+}
 #
 #if [ ! -d $ANDROID_PLATFORM_CHECK_MIN ]; then {
 #  echo -e -n "${yel}" "    Android SDK Platform ... MISSING, downloading may take a very long time... "
@@ -125,15 +125,18 @@ fi
 #}
 #fi
 
+updateSDK
 mkdir -p $BUILD_PATH
 cd $BUILD_PATH
 export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH
 android list targets
-cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=10 $SOURCE_PATH
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=19 $SOURCE_PATH
 make && make apkg || exit 1
 mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk
-mv navit/android/bin/Navit-debug-unaligned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug-unaligned.apk
-make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk
+#mv navit/android/bin/Navit-debug-unaligned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug-unaligned.apk
+#make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk
+
+echo $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk
 
 echo
 echo "Build leftovers :"
diff --git a/circle.yml b/circle.yml
index 72b00e2c2..2465ac3d8 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,11 +1,11 @@
 machine:
   environment:
-    #ANDROID_HOME: /home/ubuntu/android
-    #ANDROID_NDK_HOME: /home/ubuntu/android/android-ndk
-    #ANDROID_SDK_CDN: https://dl.google.com/android
-    #ANDROID_SDK_FILE: android-sdk_r24.0.2-linux.tgz
-    #ANDROID_NDK_CDN: http://dl.google.com/android/ndk
-    #ANDROID_NDK_FILE: android-ndk-r10d-linux-x86_64.bin
+    ANDROID_HOME: /home/ubuntu/android
+    ANDROID_NDK_HOME: /home/ubuntu/android/android-ndk
+    ANDROID_SDK_CDN: https://dl.google.com/android
+    ANDROID_SDK_FILE: android-sdk_r24.0.2-linux.tgz
+    ANDROID_NDK_CDN: http://dl.google.com/android/ndk
+    ANDROID_NDK_FILE: android-ndk-r10d-linux-x86_64.bin
     CMAKE_FILE: ../Toolchain/arm-eabi.cmake
 dependencies:
   cache_directories:
@@ -28,8 +28,8 @@ dependencies:
     - cp bin/po/navit.pot $CIRCLE_ARTIFACTS/
     - "curl 'https://translations.launchpad.net/navit/trunk/+translations-upload' -H \"$lp_cookie\" -H 'Referer: https://translations.launchpad.net/navit/trunk/+translations-upload' -F file=@bin/po/navit.pot"
 # Android build    
-    # - wget -c -N -q $ANDROID_SDK_CDN/$ANDROID_SDK_FILE -O $ANDROID_HOME/$ANDROID_SDK_FILE
-    # - wget -c -N -q $ANDROID_NDK_CDN/$ANDROID_NDK_FILE -O $ANDROID_HOME/$ANDROID_NDK_FILE
+    - wget -c -N -q $ANDROID_SDK_CDN/$ANDROID_SDK_FILE -O $ANDROID_HOME/$ANDROID_SDK_FILE
+    - wget -c -N -q $ANDROID_NDK_CDN/$ANDROID_NDK_FILE -O $ANDROID_HOME/$ANDROID_NDK_FILE
     - sudo apt-get install gpsd
     - sudo apt-get install gpsd-clients
     - sudo apt-get install libgps-dev