Merge branch 'master' into release

Author: Plamen5kov

CHANGELOG.md

@@ -0,0 +1,45 @@
+Android Runtime Changelog
+==============================
+
+0.10.0 (2015, April 17)
+==
+
+### Fixed
+
+### New
+
+* Added Dynamic Generator for binding proxies. This boosts the initial loading time, especially on Android 5.0+ devices.
+* Added several optimization techniques, which further optimize the loading time and the overall performance.
+* Improved the error reporting mechanism for Debug builds.
+* Added support for package.json and index.js for bootstrapping an application.
+
+### Breaking Changes
+
+  * Removed the simulated property-like support for Android types. E.g. the `android.content.Intent.getAction()` previously was accessible like `android.content.Intent.Action`. This is no longer valid as it contradicts with the Android APIs.
+  * Changed the way `extend` constructs work
+```javascript
+// WRONG
+var handler = new android.os.Handler.extend({...})();
+
+// CORRECT
+var handlerType = android.os.Handler.extend({...});
+var handler = new handlerType();
+```
+  * The directory structure in the `assets` folder has changed. The `tns_modules` directory is now within the `assets/app` one. To migrate older CLI projects to the new structure simply move the content of the inner app folder one level up:
+
+####Previous structure:
+```
+|--app
+|--|--app
+|--|--|--bootstrap.js
+|--|--|--myFile.js
+|--|--tns_modules
+```
+
+####New structure:
+```
+|--app
+|--|--bootstrap.js
+|--|--myFile.js
+|--|--tns_modules
+```

src/jni/Android.mk

@@ -3,22 +3,47 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE    := v8_base
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-    LOCAL_SRC_FILES := libs/arm/libv8_base.arm.a
+    LOCAL_SRC_FILES := libs/arm/libv8_base.a
 else ifeq ($(TARGET_ARCH_ABI),armeabi)
-    LOCAL_SRC_FILES := libs/arm/libv8_base.arm.a
+    LOCAL_SRC_FILES := libs/arm/libv8_base.a
 else ifeq ($(TARGET_ARCH_ABI),x86)
-    LOCAL_SRC_FILES := libs/x86/libv8_base.ia32.a
+    LOCAL_SRC_FILES := libs/x86/libv8_base.a
 endif
 include $(PREBUILT_STATIC_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE    := v8_libplatform
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+    LOCAL_SRC_FILES := libs/arm/libv8_libplatform.a
+else ifeq ($(TARGET_ARCH_ABI),armeabi)
+    LOCAL_SRC_FILES := libs/arm/libv8_libplatform.a
+else ifeq ($(TARGET_ARCH_ABI),x86)
+    LOCAL_SRC_FILES := libs/x86/libv8_libplatform.a
+endif
+include $(PREBUILT_STATIC_LIBRARY)
+
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := v8_libbase
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+    LOCAL_SRC_FILES := libs/arm/libv8_libbase.a
+else ifeq ($(TARGET_ARCH_ABI),armeabi)
+    LOCAL_SRC_FILES := libs/arm/libv8_libbase.a
+else ifeq ($(TARGET_ARCH_ABI),x86)
+    LOCAL_SRC_FILES := libs/x86/libv8_libbase.a
+endif
+include $(PREBUILT_STATIC_LIBRARY)
+
+
+
 include $(CLEAR_VARS)
 LOCAL_MODULE    := v8_nosnapshot
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-    LOCAL_SRC_FILES := libs/arm/libv8_nosnapshot.arm.a
+    LOCAL_SRC_FILES := libs/arm/libv8_nosnapshot.a
 else ifeq ($(TARGET_ARCH_ABI),armeabi)
-    LOCAL_SRC_FILES := libs/arm/libv8_nosnapshot.arm.a
+    LOCAL_SRC_FILES := libs/arm/libv8_nosnapshot.a
 else ifeq ($(TARGET_ARCH_ABI),x86)
-    LOCAL_SRC_FILES := libs/x86/libv8_nosnapshot.ia32.a
+    LOCAL_SRC_FILES := libs/x86/libv8_nosnapshot.a
 endif
 include $(PREBUILT_STATIC_LIBRARY)
 
@@ -47,14 +72,14 @@ LOCAL_SRC_FILES := com_tns_Platform.cpp com_tns_JsDebugger.cpp com_tns_AssetExtr
 					FieldAccessor.cpp ArrayElementAccessor.cpp \
 					ExceptionUtil.cpp Util.cpp Logger.cpp Profiler.cpp \
 					ObjectManager.cpp NumericCasts.cpp WeakRef.cpp \
-					MetadataMethodInfo.cpp
+					MetadataMethodInfo.cpp SimpleProfiler.cpp
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_LDLIBS    := -llog -landroid -lz
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-LOCAL_STATIC_LIBRARIES := v8_base v8_nosnapshot zip android-ndk-profiler
+LOCAL_STATIC_LIBRARIES := v8_base v8_libbase v8_libplatform v8_nosnapshot zip android-ndk-profiler
 #LOCAL_CFLAGS += -pg -DNDK_PROFILER_ENABLED
 else
-LOCAL_STATIC_LIBRARIES := v8_base v8_nosnapshot zip
+LOCAL_STATIC_LIBRARIES := v8_base v8_libbase v8_libplatform v8_nosnapshot zip
 endif
 include $(BUILD_SHARED_LIBRARY)
 

src/jni/Application.mk

@@ -1,4 +1,4 @@
-APP_ABI :=  armeabi-v7a x86
+APP_ABI := armeabi-v7a x86
 
 APP_STL := stlport_static
 #APP_STL := gnustl_static

src/jni/ArgConverter.cpp

@@ -57,9 +57,9 @@ void ArgConverter::NativeScriptLongFunctionCallback(const v8::FunctionCallbackIn
 	auto isolate = Isolate::GetCurrent();
 	args.This()->SetHiddenValue(V8StringConstants::GetJavaLong(), Boolean::New(isolate, true));
 	args.This()->SetHiddenValue(ConvertToV8String(V8StringConstants::MARKED_AS_LONG), args[0]);
-	args.This()->Set(V8StringConstants::GetValue(), args[0], (PropertyAttribute)(ReadOnly | DontDelete));
+	args.This()->Set(V8StringConstants::GetValue(), args[0]);
 
-	args.This()->SetPrototype(Handle<NumberObject>::New(Isolate::GetCurrent(), *NAN_NUMBER_OBJECT));
+	args.This()->SetPrototype(Local<NumberObject>::New(Isolate::GetCurrent(), *NAN_NUMBER_OBJECT));
 }
 
 

src/jni/ExceptionUtil.cpp

@@ -245,7 +245,15 @@ bool ExceptionUtil::ThrowExceptionToJava(TryCatch& tc, const string& prependMess
 {
 	Isolate *isolate = Isolate::GetCurrent();
 	auto ex = tc.Exception();
-	string message = PrintErrorMessage(tc.Message(), ex);
+
+	bool isExceptionEmpty = ex.IsEmpty();
+	bool isMessageEmpty = tc.Message().IsEmpty();
+
+	string message;
+	if(!isExceptionEmpty && !isMessageEmpty){
+		message = PrintErrorMessage(tc.Message(), ex);
+	}
+
 	stringstream ss;
 	ss << endl << prependMessage << message;
 	string loggedMessage = ss.str();

src/jni/JEnv.cpp

@@ -26,7 +26,7 @@ JEnv::JEnv(bool detach)
 }
 
 JEnv::JEnv(JNIEnv *jniEnv)
-	: m_env(jniEnv)
+	: m_env(jniEnv), m_detach(false)
 {
 }
 

src/jni/JsDebugger.cpp

@@ -1,7 +1,7 @@
 #include "JsDebugger.h"
-#include "v8-debug.h"
+#include "V8GlobalHelpers.h"
+#include "JniLocalRef.h"
 #include <assert.h>
-#include <android/log.h>
 
 using namespace std;
 using namespace tns;
@@ -10,71 +10,80 @@ JsDebugger::JsDebugger()
 {
 }
 
-void JsDebugger::Init(const string& packageName, int port)
+void JsDebugger::Init(v8::Isolate *isolate, const string& packageName)
 {
+	s_isolate = isolate;
 	s_packageName = packageName;
-	s_port = port;
 
 	JEnv env;
 	s_JsDebuggerClass = env.FindClass("com/tns/JsDebugger");
 	assert(s_JsDebuggerClass != nullptr);
-	s_DispatchMessagesDebugAgentCallback = env.GetStaticMethodID(s_JsDebuggerClass, "dispatchMessagesDebugAgentCallback", "()Z");
-	assert(s_DispatchMessagesDebugAgentCallback != nullptr);
 
-	v8::Debug::SetDebugMessageDispatchHandler(DispatchMessagesDebugAgentCallback);
+	s_EnqueueMessage = env.GetStaticMethodID(s_JsDebuggerClass, "enqueueMessage", "(Ljava/lang/String;)V");
+	assert(s_EnqueueMessage != nullptr);
 }
 
-int JsDebugger::GetDebuggerPort()
+string JsDebugger::GetPackageName()
 {
-	return s_port;
+	return s_packageName;
 }
 
-int JsDebugger::GetCurrentDebuggerPort()
+void JsDebugger::MyMessageHandler(const v8::Debug::Message& message)
 {
-	__android_log_print(ANDROID_LOG_DEBUG, "TNS.Native", "GetCurrentDebuggerPort ret=%d", s_currentPort);
-	return s_currentPort;
+	auto json = message.GetJSON();
+	auto str = ConvertToString(json);
+
+	JEnv env;
+	JniLocalRef s(env.NewStringUTF(str.c_str()));
+
+	env.CallStaticVoidMethod(s_JsDebuggerClass, s_EnqueueMessage, (jstring)s);
 }
 
-string JsDebugger::GetPackageName()
+void JsDebugger::Enable()
 {
-	return s_packageName;
+	auto isolate = s_isolate;
+	v8::Isolate::Scope isolate_scope(isolate);
+	v8::HandleScope handleScope(isolate);
+
+	v8::Debug::SetMessageHandler(MyMessageHandler);
 }
 
-void JsDebugger::DispatchMessagesDebugAgentCallback()
+void JsDebugger::Disable()
 {
-	JEnv env(true);
-	jboolean success = env.CallStaticBooleanMethod(s_JsDebuggerClass, s_DispatchMessagesDebugAgentCallback);
-	assert(JNI_TRUE == success);
+	auto isolate = s_isolate;
+	v8::Isolate::Scope isolate_scope(isolate);
+	v8::HandleScope handleScope(isolate);
+
+	v8::Debug::SetMessageHandler(nullptr);
 }
 
-void JsDebugger::ProcessDebugMessages()
+void JsDebugger::DebugBreak()
 {
-	if (s_currentPort != INVALID_PORT)
-	{
-		v8::Debug::ProcessDebugMessages();
-	}
+	auto isolate = s_isolate;
+	v8::Isolate::Scope isolate_scope(isolate);
+	v8::HandleScope handleScope(isolate);
+
+	v8::Debug::DebugBreak(isolate);
 }
 
-bool JsDebugger::EnableAgent(const std::string& name, int port, bool waitForConnection)
+void JsDebugger::ProcessDebugMessages()
 {
-	bool success = ((0 < port) && (port < 65536))
-					? v8::Debug::EnableAgent(name.c_str(), port, waitForConnection)
-					: false;
-	__android_log_print(ANDROID_LOG_DEBUG, "TNS.Native", "Enable V8 debugger (app=%s, port=%d, waitForConnection=%d, success=%d)", name.c_str(), port, waitForConnection, success);
-	s_currentPort = success ? port : INVALID_PORT;
-	return success;
+	auto isolate = s_isolate;
+	v8::Isolate::Scope isolate_scope(isolate);
+	v8::HandleScope handleScope(isolate);
+
+	v8::Debug::ProcessDebugMessages();
 }
 
-void JsDebugger::DisableAgent()
+void JsDebugger::SendCommand(uint16_t *cmd, int length)
 {
-	v8::Debug::DisableAgent();
-	s_currentPort = INVALID_PORT;
-	__android_log_print(ANDROID_LOG_DEBUG, "TNS.Native", "Disable V8 debugger");
+	auto isolate = s_isolate;
+
+	v8::Debug::SendCommand(isolate, cmd, length, nullptr);
 }
 
-int JsDebugger::s_port = JsDebugger::INVALID_PORT;
-int JsDebugger::s_currentPort = JsDebugger::INVALID_PORT;
+v8::Isolate* JsDebugger::s_isolate = nullptr;
 string JsDebugger::s_packageName = "";
 jclass JsDebugger::s_JsDebuggerClass = nullptr;
-jmethodID JsDebugger::s_DispatchMessagesDebugAgentCallback = nullptr;
+jmethodID JsDebugger::s_EnqueueMessage = nullptr;
 

src/jni/JsDebugger.h

@@ -2,37 +2,38 @@
 #define JSDEBUGGER_H_
 
 #include <string>
+#include "v8.h"
+#include "v8-debug.h"
 #include "JEnv.h"
 
 namespace tns
 {
 	class JsDebugger
 	{
 	public:
-		static void Init(const std::string& packageName, int port);
+		static void Init(v8::Isolate *isolate, const std::string& packageName);
 
 		static void ProcessDebugMessages();
 
-		static bool EnableAgent(const std::string& name, int port, bool waitForConnection);
+		static void Enable();
 
-		static void DisableAgent();
+		static void Disable();
 
-		static int GetDebuggerPort();
-
-		static int GetCurrentDebuggerPort();
+		static void DebugBreak();
 
 		static std::string GetPackageName();
 
+		static void SendCommand(uint16_t *cmd, int length);
+
 	private:
 		JsDebugger();
 
-		static void DispatchMessagesDebugAgentCallback();
+		static void MyMessageHandler(const v8::Debug::Message& message);
 
-		static int s_port;
-		static int s_currentPort;
 		static std::string s_packageName;
 		static jclass s_JsDebuggerClass;
-		static jmethodID s_DispatchMessagesDebugAgentCallback;
+		static jmethodID s_EnqueueMessage;
+		static v8::Isolate *s_isolate;
 
 		static const int INVALID_PORT = -1;
 	};