Merge pull request #1189 from NativeScript/master

RC

Author: Vasil Hristov

CHANGELOG.md

@@ -2,7 +2,6 @@
 ==
 
 ## What's New
-- [Upgrade v8 to 6.9.427.23(#1168)](https://github.com/NativeScript/android-runtime/issues/1168)
 - [Added support for before-plugins.gradle file applied before plugin(#1183)](https://github.com/NativeScript/android-runtime/pull/1185)
 - [Make JSParser in SBG fail the build when failing(#1152)](https://github.com/NativeScript/android-runtime/issues/1152)
 - [Generate interface names list in SBG in parallel(#1132)](https://github.com/NativeScript/android-runtime/issues/1132)

build-artifacts/project-template-gradle/settings.json

@@ -1,3 +1,3 @@
 {
-    "v8Version": "6.9.427.23"
+    "v8Version": "6.7.288.46"
 }

package.json

@@ -10,7 +10,7 @@
     "**/*"
   ],
   "gradle": {
-      "version": "4.4",
-      "android": "3.1.4"
+      "version": "4.10.2",
+      "android": "3.2.0"
   }
 }

test-app/app/src/main/assets/app/modules/libCalc-arm.so

@@ -179,12 +179,12 @@ MESSAGE( STATUS "# CMAKE_CXX_FLAGS: " ${CMAKE_CXX_FLAGS} )
 # linking v8 and inspector libraries to runtime(NativeScript library)
 target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libzip.a )
 target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_base.a )
-target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_snapshot.a )
 target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_init.a )
 target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_initializers.a )
 target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_libplatform.a )
 target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_libsampler.a )
 target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_libbase.a )
+target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_snapshot.a )
 
 # Command info: https://cmake.org/cmake/help/v3.4/command/find_library.html
 # Searches for a specified prebuilt library and stores the path as a
@@ -195,6 +195,7 @@ target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROI
 find_library( system-log log )
 find_library( system-android android )
 find_library( system-dl dl )
+find_library( system-atomic atomic ) # TODO: plamen5kov: can't be found in ndk for some reasong ... look at it later (maybe deprecated in newer NDK versions)
 find_library( system-z z )
 
 # Command info: https://cmake.org/cmake/help/v3.4/command/target_link_libraries.html

test-app/app/src/main/assets/app/modules/libCalc-arm64.so

@@ -482,8 +482,8 @@ void ObjectManager::MarkReachableObjects(Isolate* isolate, const Local<Object>&
         }
 
         auto o = top.As<Object>();
-        if (!isInFirstRun) {
-            unsigned long addr = NativeScriptExtension::GetAddress(o);
+        if(!isInFirstRun) {
+            uint8_t* addr = NativeScriptExtension::GetAddress(o);
             auto itFound = m_visited.find(addr);
             if (itFound != m_visited.end()) {
                 continue;

test-app/app/src/main/assets/app/modules/libCalc-x86.so

@@ -201,7 +201,7 @@ class ObjectManager {
 
         PersistentObjectIdSet m_released;
 
-        std::set<unsigned long> m_visited;
+        std::set<uint8_t*> m_visited;
 
         LRUCache<int, jweak> m_cache;
 

test-app/runtime/CMakeLists.txt

@@ -82,12 +82,12 @@ void Profiler::StopCPUProfilerCallbackImpl(const v8::FunctionCallbackInfo<v8::Va
 }
 
 void Profiler::StartCPUProfiler(Isolate* isolate, const Local<String>& name) {
-    auto v8prof = CpuProfiler::New(isolate);
+    auto v8prof = isolate->GetCpuProfiler();
     v8prof->StartProfiling(name, true);
 }
 
 bool Profiler::StopCPUProfiler(Isolate* isolate, const Local<String>& name) {
-    auto v8prof = CpuProfiler::New(isolate);
+    auto v8prof = isolate->GetCpuProfiler();
     auto cpuProfile = v8prof->StopProfiling(name);
 
     auto success = false;

test-app/runtime/src/main/cpp/ObjectManager.cpp

@@ -1,22 +1,23 @@
 #include "v8.h"
 
 namespace v8 {
+	
+	class NativeScriptExtension {
+	public:
+		static uint8_t* GetAddress(const v8::Local<v8::Object>& obj);
 
-class NativeScriptExtension {
-    public:
-        static unsigned long GetAddress(const v8::Local<v8::Object>& obj);
+		static v8::Local<v8::Value>* GetClosureObjects(v8::Isolate *isolate, const v8::Local<v8::Function>& func, int *length);
 
-        static v8::Local<v8::Value>* GetClosureObjects(v8::Isolate* isolate, const v8::Local<v8::Function>& func, int* length);
+		static void ReleaseClosureObjects(v8::Local<v8::Value>* closureObjects);
+		
+		static void GetAssessorPair(v8::Isolate *isolate, const v8::Local<v8::Object>& obj, const v8::Local<v8::String>& propName, v8::Local<v8::Value>& getter, v8::Local<v8::Value>& setter);
 
-        static void ReleaseClosureObjects(v8::Local<v8::Value>* closureObjects);
+		static v8::Local<v8::Array> GetPropertyKeys(v8::Isolate *isolate, const v8::Local<v8::Context>& context, const v8::Local<v8::Object>& object, bool& success);
 
-        static void GetAssessorPair(v8::Isolate* isolate, const v8::Local<v8::Object>& obj, const v8::Local<v8::String>& propName, v8::Local<v8::Value>& getter, v8::Local<v8::Value>& setter);
+    static void CpuFeaturesProbe(bool cross_compile);
+	private:
+		NativeScriptExtension();
 
-        static v8::Local<v8::Array> GetPropertyKeys(v8::Isolate* isolate, const v8::Local<v8::Context>& context, const v8::Local<v8::Object>& object, bool& success);
-
-        static void CpuFeaturesProbe(bool cross_compile);
-    private:
-        NativeScriptExtension();
-};
+		// static v8::internal::Handle<v8::internal::FixedArray> GetEnumPropertyKeys(const v8::internal::Handle<v8::internal::JSObject>& object, bool cache_result);
+	};
 }
-

test-app/runtime/src/main/cpp/ObjectManager.h

@@ -62,7 +62,7 @@ V8_PLATFORM_EXPORT bool PumpMessageLoop(
     v8::Platform* platform, v8::Isolate* isolate,
     MessageLoopBehavior behavior = MessageLoopBehavior::kDoNotWait);
 
-V8_PLATFORM_EXPORT V8_DEPRECATED(
+V8_PLATFORM_EXPORT V8_DEPRECATE_SOON(
     "This function has become obsolete and is essentially a nop",
     void EnsureEventLoopInitialized(v8::Platform* platform,
                                     v8::Isolate* isolate));