Merge pull request #879 from joshuastray/fix_reflection

move the native implementation of evalString to CCJavascriptJavaBridge.cpp

Author: dingpinglv

frameworks/js-bindings/bindings/Android.mk

@@ -22,7 +22,6 @@ LOCAL_SRC_FILES := auto/jsb_cocos2dx_auto.cpp \
                    manual/jsb_opengl_registration.cpp \
                    manual/jsb_event_dispatcher_manual.cpp \
                    manual/platform/android/CCJavascriptJavaBridge.cpp \
-                   manual/platform/android/org_cocos2dx_lib_Cocos2dxJavascriptJavaBridge.cpp \
                    manual/chipmunk/js_bindings_chipmunk_auto_classes.cpp \
                    manual/chipmunk/js_bindings_chipmunk_functions.cpp \
                    manual/chipmunk/js_bindings_chipmunk_manual.cpp \
@@ -68,4 +67,4 @@ include $(BUILD_STATIC_LIBRARY)
 
 $(call import-module,.)
 $(call import-module,external/spidermonkey/prebuilt/android)
-$(call import-module,storage/local-storage)
+$(call import-module,storage/local-storage)

frameworks/js-bindings/bindings/manual/platform/android/CCJavascriptJavaBridge.cpp

@@ -31,6 +31,24 @@
 #define  LOG_TAG    "CCJavascriptJavaBridge"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JNIEXPORT jint JNICALL Java_org_cocos2dx_lib_Cocos2dxJavascriptJavaBridge_evalString
+  (JNIEnv *env, jclass cls, jstring value)
+{
+    const char *_value = env->GetStringUTFChars(value, NULL);
+    ScriptingCore::getInstance()->evalString(_value,NULL);
+    env->ReleaseStringUTFChars(value, _value);
+    
+    return 1;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
 JavascriptJavaBridge::CallInfo::~CallInfo(void)
 {
     if (m_returnType == TypeString && m_ret.stringValue)