mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: When debugging, the installLocation must be "internalOnly".

Browse Source 
Otherwise the gdbserver ends up with

run-as: exec failed for /data/data/org.libreoffice/lib/gdbserver Error:Permission denied

(you need to run ndk-gdb with --verbose to see that).

Change-Id: Iccdf0ff268c20d2fb5abc1e93404375fa51c1cf1
This commit is contained in:
Jan Holesovsky
2014-10-13 10:19:25 +02:00
parent 1c8695ecf6
commit 02119a79c1
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/experimental/LOAndroid3/AndroidManifest.xml.in
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.libreoffice" package="org.libreoffice"
android:installLocation="preferExternal" @ANDROID_INSTALL_LOCATION@
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">

24
configure.ac
View File

@@ -3751,24 +3751,28 @@ AC_MSG_CHECKING([whether to do a debug build])
if test -n "$enable_debug" && test "$enable_debug" != "yes" && test "$enable_debug" != "no"; then if test -n "$enable_debug" && test "$enable_debug" != "yes" && test "$enable_debug" != "no"; then
AC_MSG_ERROR([--enable-debug now accepts only yes or no, use --enable-selective-debuginfo]) AC_MSG_ERROR([--enable-debug now accepts only yes or no, use --enable-selective-debuginfo])
fi fi
if test -n "$ENABLE_DBGUTIL"; then if test -n "$ENABLE_DBGUTIL" -a "$enable_debug" = "no"; then
if test "$enable_debug" = "no"; then AC_MSG_ERROR([--disable-debug cannot be used with --enable-dbgutil])
AC_MSG_ERROR([--disable-debug cannot be used with --enable-dbgutil]) fi
if test -n "$ENABLE_DBGUTIL" -o \( -n "$enable_debug" -a "$enable_debug" != "no" \) ; then
ENABLE_DEBUG="TRUE"
ANDROID_DEBUGGABLE='android:debuggable="true"'
ANDROID_INSTALL_LOCATION='android:installLocation="internalOnly"'
if test -n "$ENABLE_DBGUTIL" ; then
AC_MSG_RESULT([yes (dbgutil)])
else
AC_MSG_RESULT([yes])
fi fi
ENABLE_DEBUG="TRUE"
ANDROID_DEBUGGABLE='android:debuggable="true"'
AC_MSG_RESULT([yes (dbgutil)])
elif test -n "$enable_debug" && test "$enable_debug" != "no"; then
ENABLE_DEBUG="TRUE"
ANDROID_DEBUGGABLE='android:debuggable="true"'
AC_MSG_RESULT([yes])
else else
ENABLE_DEBUG="" ENABLE_DEBUG=""
ANDROID_DEBUGGABLE="" ANDROID_DEBUGGABLE=""
ANDROID_INSTALL_LOCATION='android:installLocation="preferExternal"'
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
AC_SUBST(ENABLE_DEBUG) AC_SUBST(ENABLE_DEBUG)
AC_SUBST(ANDROID_DEBUGGABLE) AC_SUBST(ANDROID_DEBUGGABLE)
AC_SUBST(ANDROID_INSTALL_LOCATION)
dnl Selective debuginfo dnl Selective debuginfo
ENABLE_DEBUGINFO_FOR= ENABLE_DEBUGINFO_FOR=