[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - configure.ac

[Miklos Vajna]

 configure.ac |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 08e16a9925592282d5c27aba23640f0b8e2cf668
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jan 22 12:42:16 2015 +0100

    configure: fix --with-android-package-name wrt ndk-gdb
    
    Default to the package name that makes ndk-gdb happy in case
    --enable-dbgutil is used (can be extended later to --enable-symbols /
    --enable-debug as well, if necessary).
    
    Change-Id: If9dc09f48c895a4a138c3911f129e84f001d5f43

diff --git a/configure.ac b/configure.ac
index 571c991..e4b2d5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12307,7 +12307,12 @@ if echo "$host_os" | grep -q linux-android ; then
     ANDROID_PACKAGE_NAME=
     AC_MSG_CHECKING([for Android package name])
     if test -z "$with_android_package_name" -o "$with_android_package_name" = "no"; then
-        ANDROID_PACKAGE_NAME="org.example"
+        if test -n "$ENABLE_DBGUTIL"; then
+            # Default to the package name that makes ndk-gdb happy.
+            ANDROID_PACKAGE_NAME="org.libreoffice"
+        else
+            ANDROID_PACKAGE_NAME="org.example.libreoffice"
+        fi
 
         AC_MSG_RESULT([not set, using $ANDROID_PACKAGE_NAME])
     else