diff options
| author | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-03-30 19:26:44 +0000 |
|---|---|---|
| committer | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-03-30 19:26:44 +0000 |
| commit | 8732d7d9ba490d526bb26933517a2a9e1db5848b (patch) | |
| tree | 103604ef2d62cecc8df5bebe65fb24f45ea375e1 | |
| parent | 3a01b94ffae456de0aa634be3e34fbee4fba62a2 (diff) | |
| download | navit-8732d7d9ba490d526bb26933517a2a9e1db5848b.tar.gz | |
Fix:android/cmake:Target sdk version may be specified before building (-DANDROID_API_VERSION=9). Default 8, minSDK=4.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4408 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | Toolchain/arm-eabi.cmake | 2 | ||||
| -rw-r--r-- | navit/android/AndroidManifest.xml.cmake | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/Toolchain/arm-eabi.cmake b/Toolchain/arm-eabi.cmake index 5f3a6b04e..6dbfa276f 100644 --- a/Toolchain/arm-eabi.cmake +++ b/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/android/AndroidManifest.xml.cmake b/navit/android/AndroidManifest.xml.cmake index dc395d2fd..87cd1ee60 100644 --- a/navit/android/AndroidManifest.xml.cmake +++ b/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" /> |