From f2a60a202fd3dd737a968820c7941686ed1d9ddb Mon Sep 17 00:00:00 2001 From: Adam Miskiewicz Date: Wed, 10 Feb 2016 10:40:42 -0800 Subject: [PATCH] Add 'file://' prefix to sourceURL when loading a script from a file. Reviewed By: svcscm Differential Revision: D2922108 Pulled By: androidtrunkagent fb-gh-sync-id: d9c98af31e844e3fed2f57a3a4250a6ef5e735a8 shipit-source-id: d9c98af31e844e3fed2f57a3a4250a6ef5e735a8 --- .../main/java/com/facebook/react/bridge/JSBundleLoader.java | 2 +- ReactAndroid/src/main/jni/react/jni/OnLoad.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java index db9fb05df..799863b08 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java @@ -31,7 +31,7 @@ public abstract class JSBundleLoader { if (fileName.startsWith("assets://")) { bridge.loadScriptFromAssets(context.getAssets(), fileName.replaceFirst("assets://", "")); } else { - bridge.loadScriptFromFile(fileName, fileName); + bridge.loadScriptFromFile(fileName, "file://" + fileName); } } diff --git a/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp index 128ef8338..783b45dd9 100644 --- a/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp +++ b/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp @@ -700,9 +700,9 @@ 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, assetNameStr); + loadApplicationUnbundle(bridge, manager, script, "file://" + assetNameStr); } else { - executeApplicationScript(bridge, script, assetNameStr); + executeApplicationScript(bridge, script, "file://" + assetNameStr); } if (env->ExceptionCheck()) { return;