diff options
| -rw-r--r-- | backends/networking/curl/networkreadstream.cpp | 6 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | dists/android/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | dists/android/AndroidManifest.xml.in | 6 |
4 files changed, 17 insertions, 2 deletions
diff --git a/backends/networking/curl/networkreadstream.cpp b/backends/networking/curl/networkreadstream.cpp index be9779409b..59d2a5475c 100644 --- a/backends/networking/curl/networkreadstream.cpp +++ b/backends/networking/curl/networkreadstream.cpp @@ -84,9 +84,10 @@ void NetworkReadStream::init(const char *url, curl_slist *headersList, const byt curl_easy_setopt(_easy, CURLOPT_NOPROGRESS, 0L); curl_easy_setopt(_easy, CURLOPT_PROGRESSFUNCTION, curlProgressCallbackOlder); curl_easy_setopt(_easy, CURLOPT_PROGRESSDATA, this); -#ifdef NINTENDO_SWITCH +#if defined NINTENDO_SWITCH || defined ANDROID_PLAIN_PORT curl_easy_setopt(_easy, CURLOPT_SSL_VERIFYPEER, 0); #endif + #if LIBCURL_VERSION_NUM >= 0x072000 // CURLOPT_XFERINFOFUNCTION introduced in libcurl 7.32.0 // CURLOPT_PROGRESSFUNCTION is used as a backup plan in case older version is used @@ -139,9 +140,10 @@ void NetworkReadStream::init(const char *url, curl_slist *headersList, Common::H curl_easy_setopt(_easy, CURLOPT_NOPROGRESS, 0L); curl_easy_setopt(_easy, CURLOPT_PROGRESSFUNCTION, curlProgressCallbackOlder); curl_easy_setopt(_easy, CURLOPT_PROGRESSDATA, this); -#ifdef NINTENDO_SWITCH +#if defined NINTENDO_SWITCH || defined ANDROID_PLAIN_PORT curl_easy_setopt(_easy, CURLOPT_SSL_VERIFYPEER, 0); #endif + #if LIBCURL_VERSION_NUM >= 0x072000 // CURLOPT_XFERINFOFUNCTION introduced in libcurl 7.32.0 // CURLOPT_PROGRESSFUNCTION is used as a backup plan in case older version is used @@ -3069,6 +3069,7 @@ if test -n "$_host"; then _port_mk="backends/platform/3ds/3ds.mk" ;; android | android-arm | android-v7a | android-arm-v7a | android-arm64-v8a | android-mips | android-mips64 | android-x86 | android-x86_64 | ouya) + DEFINES="$DEFINES -D__ANDROID_PLAIN_PORT__ -DANDROID_PLAIN_PORT" # we link a .so as default append_var LDFLAGS "-shared" append_var LDFLAGS "-Wl,-Bsymbolic,--no-undefined" diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml index a344af79fa..0e30097213 100644 --- a/dists/android/AndroidManifest.xml +++ b/dists/android/AndroidManifest.xml @@ -21,6 +21,12 @@ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> + <uses-permission + android:name="android.permission.INTERNET" /> + + <uses-permission + android:name="android.permission.ACCESS_NETWORK_STATE" /> + <uses-feature android:name="android.hardware.wifi" android:required="false"/> diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in index 6b7ee739db..17757d0a9c 100644 --- a/dists/android/AndroidManifest.xml.in +++ b/dists/android/AndroidManifest.xml.in @@ -21,6 +21,12 @@ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> + <uses-permission + android:name="android.permission.INTERNET" /> + + <uses-permission + android:name="android.permission.ACCESS_NETWORK_STATE" /> + <uses-feature android:name="android.hardware.wifi" android:required="false"/> |