diff options
| author | Markus Pfau <pfau@peak3d.de> | 2017-01-03 13:35:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-03 13:35:55 +0100 |
| commit | 58093722a658127f08acb910a76e0e006d6523a7 (patch) | |
| tree | 67693cd52ed2afb94ed683e1593b88cbc05d1147 | |
| parent | 4cc1d47599edf93c92271ad1eee32675eaf035e8 (diff) | |
| parent | 8895dac9a59e73db42eb747230cf1c40b7a533cd (diff) | |
Merge pull request #11353 from peak3d/android_debug
android:debuggable support
| -rw-r--r-- | cmake/scripts/android/Install.cmake | 6 | ||||
| -rw-r--r-- | tools/android/packaging/xbmc/AndroidManifest.xml.in | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/cmake/scripts/android/Install.cmake b/cmake/scripts/android/Install.cmake index b1084dfcc1..b1a5cdbf43 100644 --- a/cmake/scripts/android/Install.cmake +++ b/cmake/scripts/android/Install.cmake @@ -13,6 +13,12 @@ if(NOT ZIPALIGN_EXECUTABLE) message(FATAL_ERROR "Could NOT find zipalign executable") endif() +if(CMAKE_BUILD_TYPE STREQUAL Debug) + set(ANDROID_DEBUGGABLE true) +else() + set(ANDROID_DEBUGGABLE false) +endif() + # Configure files into packaging environment. configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/Makefile.in ${CMAKE_BINARY_DIR}/tools/android/packaging/Makefile @ONLY) diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml.in b/tools/android/packaging/xbmc/AndroidManifest.xml.in index b4dc83e5ac..829add3398 100644 --- a/tools/android/packaging/xbmc/AndroidManifest.xml.in +++ b/tools/android/packaging/xbmc/AndroidManifest.xml.in @@ -25,7 +25,8 @@ <application android:icon="@drawable/ic_launcher" android:logo="@drawable/banner" android:label="@string/app_name" - android:hasCode="true"> + android:hasCode="true" + android:debuggable="@ANDROID_DEBUGGABLE@"> <activity android:name=".Splash" android:configChanges="orientation|keyboard|keyboardHidden|navigation|touchscreen|screenLayout|screenSize" |