Merge pull request #12 from navit-gps/android-tuning-2

build fix

5 files changed, 8 insertions, 10 deletions

diff --git a/ci/build.sh b/ci/build.sh
index 229f57f25..00d0d2d56 100644
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -2,7 +2,7 @@ tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz
 export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH
 
 mkdir bin && cd bin
-cov-build --dir cov-int cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE
+cov-build --dir cov-int cmake ../ -DSAMPLE_MAP=n -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE
 cov-build --dir cov-int make || exit -1
 tar czvf navit.tgz cov-int
 
diff --git a/ci/build_android.sh b/ci/build_android.sh
index 968765f28..7aadecd8d 100644
--- a/ci/build_android.sh
+++ b/ci/build_android.sh
@@ -135,7 +135,7 @@ if [[ "$svn_rev" == "" ]]; then svn_rev="0"; fi
 sed -i -e "s/ANDROID_VERSION_INT=\"0\"/ANDROID_VERSION_INT=\"${svn_rev}\"/g" ~/navit/navit/android/CMakeLists.txt
 cp ~/navit/navit/android/CMakeLists.txt $CIRCLE_ARTIFACTS/
 
-cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=19 $SOURCE_PATH
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DANDROID_API_VERSION=19 $SOURCE_PATH
 make || exit 1
 if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
   make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk
diff --git a/circle.yml b/circle.yml
index 628d130e1..3d92a9b71 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,7 +3,7 @@ machine:
     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_SDK_FILE: android-sdk_r24.3.3-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
@@ -44,7 +44,7 @@ dependencies:
 # for sys/select.h
 #    - sudo apt-get install -y libc6-dev
     - mkdir win32
-    - cmake -Dbinding/python:BOOL=FALSE -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make && make package:
+    - cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make && make package:
         pwd: win32/
     - cp win32/*.exe $CIRCLE_ARTIFACTS/
 # For python testing with junit reporting
diff --git a/navit/android/AndroidManifest.xml.cmake b/navit/android/AndroidManifest.xml.cmake
index c70ab66aa..9267f65a3 100644
--- a/navit/android/AndroidManifest.xml.cmake
+++ b/navit/android/AndroidManifest.xml.cmake
@@ -5,7 +5,7 @@
       android:versionCode="@ANDROID_VERSION_INT@"
       android:versionName="@ANDROID_VERSION_NAME@-@ANDROID_VERSION_INT@"
       android:installLocation="auto">
-    <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="@ANDROID_API_VERSION@"/>
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="@ANDROID_API_VERSION@"/>
     <uses-feature android:name="android.hardware.location.network" android:required="false"/>
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
     <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:resizeable="true" android:anyDensity="true"/>
@@ -20,8 +20,7 @@
                  android:name=".NavitAppConfig">
         <activity android:name="Navit"
                   android:label="@string/app_name"
-                  android:theme="@android:style/Theme.NoTitleBar"
-                  android:configChanges="locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale">
+                  android:configChanges="locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/navit/android/AndroidManifest.xml.in b/navit/android/AndroidManifest.xml.in
index 09e8410ff..5a43ee277 100644
--- a/navit/android/AndroidManifest.xml.in
+++ b/navit/android/AndroidManifest.xml.in
@@ -10,8 +10,7 @@
                  android:name=".NavitAppConfig">
         <activity android:name="Navit"
                   android:label="@string/app_name"
-                  android:theme="@android:style/Theme.NoTitleBar"
-		  android:configChanges="locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale">
+		  android:configChanges="locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -27,7 +26,7 @@
 		<activity android:name=".NavitAddressResultListActivity"></activity>
         <activity android:name=".FileBrowserActivity"></activity>
     </application>
-    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/>
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19"/>
     <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:resizeable="true" android:anyDensity="true"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />