android/experimental/LOAndroid3/AndroidManifest.xml | 84 -----------------
android/experimental/LOAndroid3/AndroidManifest.xml.in | 84 +++++++++++++++++
configure.ac | 8 +
3 files changed, 91 insertions(+), 85 deletions(-)
New commits:
commit 25b110cd13b63310a41d5edbda36a8871349858d
Author: Jan Holesovsky <ke...@collabora.com>
Date: Wed Oct 1 17:01:59 2014 +0200
android: android:debuggable setting now depends on configure options.
Change-Id: I12d9c05fb05e4cf202c5c0d7b7e87c145d163fea
diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml
b/android/experimental/LOAndroid3/AndroidManifest.xml.in
similarity index 99%
rename from android/experimental/LOAndroid3/AndroidManifest.xml
rename to android/experimental/LOAndroid3/AndroidManifest.xml.in
index 83608b8..cfd369a 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml
+++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in
@@ -11,7 +11,7 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<application
- android:debuggable="true"
+ @ANDROID_DEBUGGABLE@
android:allowBackup="true"
android:icon="@drawable/main"
android:label="@string/app_name"
diff --git a/configure.ac b/configure.ac
index 93fc825..4e2eec9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3760,15 +3760,19 @@ if test -n "$ENABLE_DBGUTIL"; 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
ENABLE_DEBUG="TRUE"
+ ANDROID_DEBUGGABLE='android:debuggable="true"'
AC_MSG_RESULT([yes])
else
ENABLE_DEBUG=""
+ ANDROID_DEBUGGABLE=""
AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_DEBUG)
+AC_SUBST(ANDROID_DEBUGGABLE)
dnl Selective debuginfo
ENABLE_DEBUGINFO_FOR=
@@ -4419,6 +4423,7 @@ if test "$cross_compiling" = "yes"; then
bin/get_config_variables \
solenv/bin/getcompver.awk \
solenv/inc/langlist.mk \
+ android/experimental/LOAndroid3/AndroidManifest.xml.in \
config_host.mk.in \
Makefile.in \
lo.xcent.in \
@@ -12779,7 +12784,8 @@ if test -f config_host.mk; then
config_md5=`$MD5SUM config_host.mk | sed "s/ .*//"`
fi
-AC_CONFIG_FILES([config_host.mk
+AC_CONFIG_FILES([android/experimental/LOAndroid3/AndroidManifest.xml
+ config_host.mk
Makefile
lo.xcent
instsetoo_native/util/openoffice.lst
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
