diff options
| author | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2017-09-26 11:04:07 +0200 |
|---|---|---|
| committer | Tobrun <tobrun.van.nuland@gmail.com> | 2017-11-01 17:43:45 -0700 |
| commit | 60ed8611256fbe4b76858bac6ffe42183bc33920 (patch) | |
| tree | da3e2be29a6fd523a8633480709a691076928fdc | |
| parent | f13a8b0afa18f83321355563894549b4b014bcc2 (diff) | |
| download | qtlocation-mapboxgl-upstream/tvn-downgrade-min-sdk.tar.gz | |
[android] - downgrade minimum sdk version to 14upstream/tvn-downgrade-min-sdk
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml | 17 | ||||
| -rw-r--r-- | platform/android/dependencies.gradle | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml index 231e36e092..8732af65e2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml @@ -1,13 +1,20 @@ <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:glEsVersion="0x00020000" + android:required="true"/> + <uses-feature + android:name="android.hardware.wifi" + android:required="false"/> <!-- Implied by ACCESS_WIFI_STATE. --> - <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"/> diff --git a/platform/android/dependencies.gradle b/platform/android/dependencies.gradle index e1eb1150ed..1eb7dd2b18 100644 --- a/platform/android/dependencies.gradle +++ b/platform/android/dependencies.gradle @@ -1,5 +1,5 @@ ext { - minSdkVersion = 15 + minSdkVersion = 14 targetSdkVersion = 25 compileSdkVersion = 25 buildToolsVersion = "25.0.2" |