summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJuha Alanen <juha.alanen@mapbox.com>2020-01-23 14:24:09 +0200
committerJuha Alanen <juha.alanen@mapbox.com>2020-02-06 17:52:12 +0200
commitd4d96fd88c83a5640fdef408f1ff3f69db0a584c (patch)
treed5cddd1ceea4eb1642c081848b499bc7ff2144dd /test
parentaed25c04383bfccfb8860a4745691538a16e093a (diff)
downloadqtlocation-mapboxgl-d4d96fd88c83a5640fdef408f1ff3f69db0a584c.tar.gz
[test] Enable HTTP server on Android
Diffstat (limited to 'test')
-rw-r--r--test/android/app/build.gradle2
-rw-r--r--test/android/app/src/main/AndroidManifest.xml2
-rw-r--r--test/include/mbgl/test/util.hpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/test/android/app/build.gradle b/test/android/app/build.gradle
index 9f915bbbd0..cadbdf6fd9 100644
--- a/test/android/app/build.gradle
+++ b/test/android/app/build.gradle
@@ -5,7 +5,7 @@ android {
defaultConfig {
applicationId = 'com.mapbox.mapboxsdk.maps.test_runner'
- minSdkVersion 14
+ minSdkVersion 24
targetSdkVersion 28
def abi = 'all'
if (project.hasProperty('mapbox.abis')) {
diff --git a/test/android/app/src/main/AndroidManifest.xml b/test/android/app/src/main/AndroidManifest.xml
index 40767881d1..5311bf0507 100644
--- a/test/android/app/src/main/AndroidManifest.xml
+++ b/test/android/app/src/main/AndroidManifest.xml
@@ -5,6 +5,8 @@
android:versionName="1.0">
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application
android:allowBackup="false"
android:fullBackupContent="false"
diff --git a/test/include/mbgl/test/util.hpp b/test/include/mbgl/test/util.hpp
index 42be19e9ae..959b3e646f 100644
--- a/test/include/mbgl/test/util.hpp
+++ b/test/include/mbgl/test/util.hpp
@@ -6,8 +6,6 @@
#if ANDROID
#define TEST_READ_ONLY 0
- #undef TEST_HAS_SERVER
- #define TEST_HAS_SERVER 0
#elif TARGET_OS_IOS
#define TEST_READ_ONLY 1
#undef TEST_HAS_SERVER