[Navit-cvs-commit] SF.net SVN: navit:[4408] trunk/navit

[<ri...@us...>]

Revision: 4408
          http://navit.svn.sourceforge.net/navit/?rev=4408&view=rev
Author:   rikky
Date:     2011-03-30 19:26:44 +0000 (Wed, 30 Mar 2011)

Log Message:
-----------
Fix:android/cmake:Target sdk version may be specified before building (-DANDROID_API_VERSION=9). Default 8, minSDK=4.

Modified Paths:
--------------
    trunk/navit/Toolchain/arm-eabi.cmake
    trunk/navit/navit/android/AndroidManifest.xml.cmake

Modified: trunk/navit/Toolchain/arm-eabi.cmake
===================================================================
--- trunk/navit/Toolchain/arm-eabi.cmake	2011-03-30 13:22:23 UTC (rev 4407)
+++ trunk/navit/Toolchain/arm-eabi.cmake	2011-03-30 19:26:44 UTC (rev 4408)
@@ -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)

Modified: trunk/navit/navit/android/AndroidManifest.xml.cmake
===================================================================
--- trunk/navit/navit/android/AndroidManifest.xml.cmake	2011-03-30 13:22:23 UTC (rev 4407)
+++ trunk/navit/navit/android/AndroidManifest.xml.cmake	2011-03-30 19:26:44 UTC (rev 4408)
@@ -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" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.