Fix:android/cmake:Target sdk version may be specified before building (-DANDROID_API_...

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4408 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/Toolchain/arm-eabi.cmake b/navit/Toolchain/arm-eabi.cmake
index 5f3a6b0..6dbfa27 100644 (file)
--- a/navit/Toolchain/arm-eabi.cmake
+++ b/navit/Toolchain/arm-eabi.cmake
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME GNU)
 
 set(ANDROID TRUE)
-set(ANDROID_API_VERSION 4 CACHE STRING "Andriod API Version")
+set(ANDROID_API_VERSION 8 CACHE STRING "Andriod API Version")
 
 find_program(CMAKE_C_COMPILER arm-eabi-gcc arm-eabi-gcc.exe)
 find_program(CMAKE_CXX_COMPILER arm-eabi-gcc arm-eabi-g++.exe)

diff --git a/navit/navit/android/AndroidManifest.xml.cmake b/navit/navit/android/AndroidManifest.xml.cmake
index dc395d2..87cd1ee 100644 (file)
--- a/navit/navit/android/AndroidManifest.xml.cmake
+++ b/navit/navit/android/AndroidManifest.xml.cmake
@@ -2,28 +2,29 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.navitproject.navit"
       android:sharedUserId="org.navitproject.navit"
-      android:versionCode="@ANDROID_VERSION_INT@" android:versionName="@ANDROID_VERSION_NAME@">
+      android:versionCode="@ANDROID_VERSION_INT@"
+      android:versionName="@ANDROID_VERSION_NAME@"
     <application android:label="@string/app_name"
                  android:icon="@drawable/icon">
         <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">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
-                               <action android:name="android.intent.action.VIEW" /> 
-                               <category android:name="android.intent.category.DEFAULT" /> 
-                               <data android:scheme="google.navigation" /> 
+                <action android:name="android.intent.action.VIEW" /> 
+                <category android:name="android.intent.category.DEFAULT" /> 
+                <data android:scheme="google.navigation" /> 
             </intent-filter>
         </activity>
-               <activity android:name=".NavitAddressSearchActivity"></activity>
+        <activity android:name=".NavitAddressSearchActivity"></activity>
         <activity android:name=".NavitDownloadSelectMapActivity"></activity>
-               <activity android:name=".NavitAddressResultListActivity"></activity>
+        <activity android:name=".NavitAddressResultListActivity"></activity>
     </application>
-    <uses-sdk android:minSdkVersion="@ANDROID_API_VERSION@" android:targetSdkVersion="7"/>
+    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="@ANDROID_API_VERSION@"/>
     <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:resizeable="true" android:anyDensity="true"/>
     @ANDROID_PERMISSIONS@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />