projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add bmx160 driver
[fw/altos]
/
altosdroid
/
AndroidManifest.xml.in
diff --git
a/altosdroid/AndroidManifest.xml.in
b/altosdroid/AndroidManifest.xml.in
index 43a0787eead32ac47b2ae51866bdb3deed0937a9..690f19908787c0b8f9e6086465d11d18d52ccf4d 100644
(file)
--- a/
altosdroid/AndroidManifest.xml.in
+++ b/
altosdroid/AndroidManifest.xml.in
@@
-22,7
+22,7
@@
package="org.altusmetrum.AltosDroid"
android:versionCode="@ANDROID_VERSION@"
android:versionName="@VERSION@">
package="org.altusmetrum.AltosDroid"
android:versionCode="@ANDROID_VERSION@"
android:versionName="@VERSION@">
- <uses-sdk android:targetSdkVersion="
12" android:minSdkVersion="12
"/>
+ <uses-sdk android:targetSdkVersion="
21" android:minSdkVersion="21
"/>
<!-- Google Maps -->
<uses-feature android:glEsVersion="0x00020000" android:required="true"/>
<!-- Google Maps -->
<uses-feature android:glEsVersion="0x00020000" android:required="true"/>
@@
-107,6
+107,8
@@
<service android:name=".TelemetryService" />
<service android:name=".TelemetryService" />
+ <meta-data android:name="com.google.android.maps.v2.API_KEY"
+ android:value="@GOOGLEKEY@"/>
<meta-data android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
</application>
<meta-data android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
</application>