[Android] jni: Fix build breakage from 33dfab3c2119f7121288c091a7b82cac40a8a5f9

[Edward Wang]

vlc-ports/android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Tue Aug 21 22:17:35 2012 -0400| [e698cdc4518c3c0b5c4859f7f6a8f82694f640a8] | committer: Edward Wang

jni: Fix build breakage from 33dfab3c2119f7121288c091a7b82cac40a8a5f9

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=e698cdc4518c3c0b5c4859f7f6a8f82694f640a8
---

 compile.sh                  |    2 +-
 vlc-android/jni/libvlcjni.c |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/compile.sh b/compile.sh
index b49eda2..6c12172 100755
--- a/compile.sh
+++ b/compile.sh
@@ -88,7 +88,7 @@ export PLATFORM_SHORT_ARCH
 export PATH=${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/`uname|tr A-Z a-z`-x86/bin:${PATH}
 
 # 1/ libvlc, libvlccore and its plugins
-TESTED_HASH=5e674f0
+TESTED_HASH=df4da38
 if [ ! -d "vlc" ]; then
     echo "VLC source not found, cloning"
     git clone git://git.videolan.org/vlc.git vlc
diff --git a/vlc-android/jni/libvlcjni.c b/vlc-android/jni/libvlcjni.c
index 29a2976..6f648f4 100644
--- a/vlc-android/jni/libvlcjni.c
+++ b/vlc-android/jni/libvlcjni.c
@@ -328,7 +328,11 @@ jstring Java_org_videolan_vlc_LibVLC_nativeToURI(JNIEnv *env, jobject thiz, jstr
     /* Get C string */
     const char* psz_path = (*env)->GetStringUTFChars(env, path, &isCopy);
     /* Convert the path to URI */
-    char* psz_location = make_URI(psz_path, "file");
+    char* psz_location;
+    if(unlikely( strstr( psz_path, "://" ) ))
+        psz_location = strdup(psz_path);
+    else
+        psz_location = vlc_path2uri(psz_path, "file");
     /* Box into jstring */
     jstring t = (*env)->NewStringUTF(env, psz_location);
     /* Clean up */