Add:Build:Made android permissions more flexible

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@2769 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/configure.in b/configure.in
index 094ab60..de59ad9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -564,6 +564,10 @@ AC_SUBST(XSLTS)
 AC_ARG_WITH(saxon, [ --with-saxon   specify the saxon xslt processor], SAXON=$withval, SAXON="saxon")
 AC_SUBST(SAXON)
 
+# Android Permissions
+AC_ARG_WITH(android-permissions, [  --with-android-permissions   Set additional android permissions], ANDROID_PERMISSIONS=$withval, ANDROID_PERMISSIONS="")
+AC_SUBST(ANDROID_PERMISSIONS)
+
 # NLS
 
 AC_ARG_ENABLE(nls,

diff --git a/navit/Makefile.am b/navit/Makefile.am
index c7e9ce8..5d89d58 100644 (file)
--- a/navit/Makefile.am
+++ b/navit/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/Makefile.inc
+comma=,
 DIST_SUBDIRS=binding map maptool fib-1.1 font fonts gui graphics osd speech support vehicle xpm maps
 SUBDIRS=binding map fib-1.1 font gui graphics osd speech support vehicle xpm
 
@@ -58,6 +59,12 @@ if SUPPORT_ANDROID
   navit_SOURCES =
   navit_LDADD =
 
+android/AndroidManifest.xml: android/AndroidManifest.xml.in
+       sed '0,/<uses-sdk/!d' <$< >$@
+       for i in $(subst $(comma), ,@ANDROID_PERMISSIONS@); do echo "    <uses-permission android:name="android.permission.$$i" />" >>$@; done
+       sed '0,/<uses-sdk/d' <$< >>$@
+       
+
 android/build.xml: android/AndroidManifest.xml
        if [ "$(builddir)" != "$(srcdir)" ]; then cp -rp $(srcdir)/android $(builddir)/android; fi
        android update project -t 3 -p android