summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorTobrun <tobrun@mapbox.com>2017-11-13 13:20:41 +0100
committerGitHub <noreply@github.com>2017-11-13 13:20:41 +0100
commita9bd09c015f36174abdc5aee0de775500597617d (patch)
tree12363c7e35ab7862a95ae8eb78e32948972c8aa7 /platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml
parenta0cfac4c1a0785fae57ef80839e3e28124c6a541 (diff)
downloadqtlocation-mapboxgl-a9bd09c015f36174abdc5aee0de775500597617d.tar.gz
Downgrade min sdk to 14 (#10355)
* [android] - downgrade minimum sdk version to 14 * [android] bump MAS version to the one which includes min sdk version 14 * bump lost version to 3.0.4
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml
index b61035a008..f59585bfe5 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml
@@ -1,14 +1,17 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.mapbox.mapboxsdk">
+ xmlns:tools="http://schemas.android.com/tools"
+ package="com.mapbox.mapboxsdk">
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
<uses-feature android:name="android.hardware.wifi" android:required="false" /> <!-- Implied by ACCESS_WIFI_STATE. -->
<uses-feature android:name="android.hardware.location.gps" android:required="false"/>
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+ <uses-sdk tools:overrideLibrary="com.mapzen.lost"/>
+
<application>
<!-- Include the telemetry service to simplify set up (https://www.mapbox.com/telemetry) -->
<service android:name="com.mapbox.services.android.telemetry.service.TelemetryService"/>