From d0cdabc73ebda59937eeecd23b93814837602075 Mon Sep 17 00:00:00 2001 From: David Aurelio Date: Tue, 15 Mar 2016 08:12:00 -0700 Subject: [PATCH] Don't prepend the asset name string with "file://" for unbundles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: D2922108 / PR #5814 broke the “Unbundle” loader by prepending the file path to the entry file with "file://". This converts it back. Reviewed By: lexs Differential Revision: D3052749 fb-gh-sync-id: 0b241c50e25f1a1c85265915bee01582d0ba7ac6 shipit-source-id: 0b241c50e25f1a1c85265915bee01582d0ba7ac6 --- ReactAndroid/src/main/jni/react/jni/OnLoad.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp index 4c0722307b47fd..9e46c57c6253a1 100644 --- a/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp +++ b/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp @@ -743,7 +743,7 @@ static void loadScriptFromAssets(JNIEnv* env, jobject obj, jobject assetManager, env->CallStaticVoidMethod(markerClass, gLogMarkerMethod, env->NewStringUTF("loadScriptFromAssets_read")); if (JniJSModulesUnbundle::isUnbundle(manager, assetNameStr)) { - loadApplicationUnbundle(bridge, manager, script, "file://" + assetNameStr); + loadApplicationUnbundle(bridge, manager, script, assetNameStr); } else { loadApplicationScript(bridge, script, "file://" + assetNameStr); }