[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [gcompris/KDE/0.60] /: android, keep the download permissions even if download is disabled
From:       Bruno Coudoin <bruno.coudoin () gcompris ! net>
Date:       2016-08-23 23:43:00
Message-ID: E1bcLLQ-0000kQ-Q4 () code ! kde ! org
[Download RAW message or body]

Git commit 29bddfe876bad0d1788c5d927f85dee6753e3731 by Bruno Coudoin.
Committed on 23/08/2016 at 23:41.
Pushed by bcoudoin into branch 'KDE/0.60'.

android, keep the download permissions even if download is disabled

I removed it because it makes the application crash on exit (tested on \
Andoid 6).

M  +4    -4    CMakeLists.txt

http://commits.kde.org/gcompris/29bddfe876bad0d1788c5d927f85dee6753e3731

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e47a65..0944f2b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,10 +133,10 @@ set(ACTIVATION_MODE "no" CACHE STRING "Policy for \
activation [no|inapp|internal]  option(WITH_DEMO_ONLY "Include only demo \
activities" OFF)  
 option(WITH_DOWNLOAD "Internal download" ON)
-if(WITH_DOWNLOAD)
-  set(ANDROID_INTERNET_PERMISSION "<uses-permission \
                android:name=\"android.permission.INTERNET\" />")
-  set(ANDROID_ACCESS_NETWORK_STATE_PERMISSION "<uses-permission \
                android:name=\"android.permission.ACCESS_NETWORK_STATE\" \
                />")
-endif(WITH_DOWNLOAD)
+# @FIXME These permissions should be removed if download is disable
+#        but it makes the application crash on exit (tested on Andoid 6)
+set(ANDROID_INTERNET_PERMISSION "<uses-permission \
android:name=\"android.permission.INTERNET\" />") \
+set(ANDROID_ACCESS_NETWORK_STATE_PERMISSION "<uses-permission \
android:name=\"android.permission.ACCESS_NETWORK_STATE\" />")  
 # Set output directory
 if(CMAKE_HOST_APPLE)


[prev in list] [next in list] [prev in thread] [next in thread]