From f7c4ed8926bb883fdb245bd73a77804dd974a14f Mon Sep 17 00:00:00 2001 From: Marc Horowitz Date: Mon, 23 May 2016 09:32:10 -0700 Subject: [PATCH] Fix chrome debugging on android Summary: Java loadApplicationScript changed, but the C++ code in the debug ProxyExecutor which called it did not. This fixes the fbjni method lookup. fixes #7659 Reviewed By: AaaChiuuu Differential Revision: D3331472 fbshipit-source-id: 33312dccc3c7687f51742e42f9e0397f9c925e76 --- ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp b/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp index 999f139d182..f0dc3bda030 100644 --- a/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp +++ b/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp @@ -41,14 +41,15 @@ ProxyExecutor::~ProxyExecutor() { } void ProxyExecutor::loadApplicationScript( - const std::string& script, + const std::string&, const std::string& sourceURL) { static auto loadApplicationScript = - jni::findClassStatic(EXECUTOR_BASECLASS)->getMethod("loadApplicationScript"); + jni::findClassStatic(EXECUTOR_BASECLASS)->getMethod("loadApplicationScript"); + + // The proxy ignores the script data passed in. loadApplicationScript( m_executor.get(), - jni::make_jstring(script).get(), jni::make_jstring(sourceURL).get()); }