diff options
| -rw-r--r-- | android/experimental/LOAndroid3/AndroidManifest.xml.in | 2 | ||||
| -rw-r--r-- | configure.ac | 22 |
2 files changed, 14 insertions, 10 deletions
diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in b/android/experimental/LOAndroid3/AndroidManifest.xml.in index 989a43ce36ac..8eb4dbbd29e9 100644 --- a/android/experimental/LOAndroid3/AndroidManifest.xml.in +++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.libreoffice" - android:installLocation="preferExternal" + @ANDROID_INSTALL_LOCATION@ android:versionCode="1" android:versionName="1.0"> diff --git a/configure.ac b/configure.ac index f05034da0873..2572e96f88d8 100644 --- a/configure.ac +++ b/configure.ac @@ -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 AC_MSG_ERROR([--enable-debug now accepts only yes or no, use --enable-selective-debuginfo]) fi -if test -n "$ENABLE_DBGUTIL"; then - if test "$enable_debug" = "no"; then - AC_MSG_ERROR([--disable-debug cannot be used with --enable-dbgutil]) - fi - ENABLE_DEBUG="TRUE" - ANDROID_DEBUGGABLE='android:debuggable="true"' - AC_MSG_RESULT([yes (dbgutil)]) -elif test -n "$enable_debug" && test "$enable_debug" != "no"; then +if test -n "$ENABLE_DBGUTIL" -a "$enable_debug" = "no"; then + 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"' - AC_MSG_RESULT([yes]) + ANDROID_INSTALL_LOCATION='android:installLocation="internalOnly"' + if test -n "$ENABLE_DBGUTIL" ; then + AC_MSG_RESULT([yes (dbgutil)]) + else + AC_MSG_RESULT([yes]) + fi else ENABLE_DEBUG="" ANDROID_DEBUGGABLE="" + ANDROID_INSTALL_LOCATION='android:installLocation="preferExternal"' AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_DEBUG) AC_SUBST(ANDROID_DEBUGGABLE) +AC_SUBST(ANDROID_INSTALL_LOCATION) dnl Selective debuginfo ENABLE_DEBUGINFO_FOR= |