Add:android:More flexibility in choosing the data directory

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4729 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 5 insertions, 2 deletions

diff --git a/navit/android.c b/navit/android.c
index 556b670a4..fb0a87af2 100644
--- a/navit/android.c
+++ b/navit/android.c
@@ -51,9 +51,9 @@ android_find_method(jclass class, char *name, char *args, jmethodID *ret)
 }
 
 JNIEXPORT void JNICALL
-Java_org_navitproject_navit_Navit_NavitMain( JNIEnv* env, jobject thiz, jobject activity, jobject lang, int version, jobject display_density_string)
+Java_org_navitproject_navit_Navit_NavitMain( JNIEnv* env, jobject thiz, jobject activity, jobject lang, int version, jobject display_density_string, jobject path)
 {
-	char *strings[]={"/data/data/org.navitproject.navit/bin/navit",NULL};
+	char *strings[]={NULL,NULL};
 	const char *langstr;
 	const char *displaydensitystr;
 	android_version=version;
@@ -71,7 +71,10 @@ Java_org_navitproject_navit_Navit_NavitMain( JNIEnv* env, jobject thiz, jobject
 	dbg(0,"*****displaydensity=%s\n",displaydensitystr);
 	setenv("ANDROID_DENSITY",displaydensitystr,1);
 	(*env)->ReleaseStringUTFChars(env, display_density_string, displaydensitystr);
+	strings[0]=(*env)->GetStringUTFChars(env, path, NULL);
 	main_real(1, strings);
+	(*env)->ReleaseStringUTFChars(env, path, strings[0]);
+	
 }
 
 JNIEXPORT void JNICALL