Upgrade V8 to 7.2.502.25

Author: darind

.travis.yml

@@ -1,7 +1,7 @@
 env:
   global:
   - NODE_VERSION=6.11.1
-  - NDK_VERSION=r18b
+  - NDK_VERSION=r19
   - DATE=$(date +%Y-%m-%d)
   - PACKAGE_VERSION=next-$DATE-$TRAVIS_BUILD_NUMBER
   - EMULATOR_API_LEVEL=21

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

@@ -1,3 +1,4 @@
 {
-    "v8Version": "7.1.302.32"
+    "v8Version": "7.2.502.25",
+    "mksnapshotParams": "--profile_deserialization --turbo_instruction_scheduling"
 }

package.json

@@ -13,5 +13,5 @@
     "version": "4.10.2",
     "android": "3.3.1"
   },
-  "android_ndk_version": "18b"
+  "android_ndk_version": "19"
 }

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

@@ -22,7 +22,17 @@ else ()
     set(ARCH_INCLUDE_DIR "arm-linux-androideabi")
 endif ()
 
-set(COMMON_CMAKE_ARGUMENTS "-std=c++11 -Werror -Wno-unused-result -mstackrealign -fexceptions -fno-builtin-stpcpy -fno-rtti")
+set(COMMON_CMAKE_ARGUMENTS "-std=c++11 -stdlib=libc++ -Werror -Wno-unused-result -mstackrealign -fexceptions -fno-builtin-stpcpy -fno-rtti")
+
+# AOSP has switched to using LLD by default and the NDK will use it by default in the next release.
+# BFD and Gold will be removed once LLD has been through a release cycle with no major unresolved issues (estimated r21)
+# Note: lld does not currently work on Windows: https://github.com/android-ndk/ndk/issues/888
+if (NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
+  MESSAGE(STATUS "## Using LLD linker")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld")
+else ()
+  MESSAGE(STATUS "## Using default linker")
+endif ()
 
 # Command info: https://cmake.org/cmake/help/v3.4/command/include_directories.html
 include_directories(
@@ -32,6 +42,8 @@ include_directories(
 
         # hack to find some libraries from the ndk
         ${ANDROID_NDK_ROOT}/sysroot/usr/include/${ARCH_INCLUDE_DIR}/
+
+        src/main/libs/${ANDROID_ABI}/include
 )
 
 if (OPTIMIZED_BUILD OR OPTIMIZED_WITH_INSPECTOR_BUILD)
@@ -76,6 +88,7 @@ if (NOT OPTIMIZED_BUILD OR OPTIMIZED_WITH_INSPECTOR_BUILD)
             src/main/cpp/v8_inspector/src/inspector/v8-overlay-agent-impl.cpp
             src/main/cpp/v8_inspector/src/inspector/v8-page-agent-impl.cpp
 
+            src/main/cpp/v8_inspector/src/inspector/custom-preview.cc
             src/main/cpp/v8_inspector/src/inspector/injected-script.cc
             src/main/cpp/v8_inspector/src/inspector/inspected-context.cc
             src/main/cpp/v8_inspector/src/inspector/remote-object-id.cc
@@ -88,18 +101,16 @@ if (NOT OPTIMIZED_BUILD OR OPTIMIZED_WITH_INSPECTOR_BUILD)
             src/main/cpp/v8_inspector/src/inspector/v8-debugger.cc
             src/main/cpp/v8_inspector/src/inspector/v8-debugger-agent-impl.cc
             src/main/cpp/v8_inspector/src/inspector/v8-debugger-script.cc
-            src/main/cpp/v8_inspector/src/inspector/v8-function-call.cc
             src/main/cpp/v8_inspector/src/inspector/v8-heap-profiler-agent-impl.cc
-            src/main/cpp/v8_inspector/src/inspector/v8-injected-script-host.cc
             src/main/cpp/v8_inspector/src/inspector/v8-inspector-impl.cc
             src/main/cpp/v8_inspector/src/inspector/v8-inspector-session-impl.cc
-            src/main/cpp/v8_inspector/src/inspector/v8-internal-value-type.cc
             src/main/cpp/v8_inspector/src/inspector/v8-profiler-agent-impl.cc
             src/main/cpp/v8_inspector/src/inspector/v8-regex.cc
             src/main/cpp/v8_inspector/src/inspector/v8-runtime-agent-impl.cc
             src/main/cpp/v8_inspector/src/inspector/v8-schema-agent-impl.cc
             src/main/cpp/v8_inspector/src/inspector/v8-stack-trace-impl.cc
             src/main/cpp/v8_inspector/src/inspector/v8-value-utils.cc
+            src/main/cpp/v8_inspector/src/inspector/value-mirror.cc
             src/main/cpp/v8_inspector/src/inspector/wasm-translation.cc
     )
 else ()
@@ -162,10 +173,19 @@ add_library(
         ${INSPECTOR_SOURCES}
 )
 
+set(NATIVES_BLOB_INCLUDE_DIRECTORIES ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/include)
+
 if (OPTIMIZED_BUILD OR OPTIMIZED_WITH_INSPECTOR_BUILD)
-    set_target_properties(NativeScript PROPERTIES LINK_FLAGS -Wl,--allow-multiple-definition -Wl,--exclude-libs=ALL -Wl,--gc-sections)
+    set_target_properties(
+        NativeScript
+        PROPERTIES LINK_FLAGS -Wl,--allow-multiple-definition -Wl,--exclude-libs=ALL -Wl,--gc-sections
+        INTERFACE_INCLUDE_DIRECTORIES NATIVES_BLOB_INCLUDE_DIRECTORIES
+    )
 else ()
-    set_target_properties(NativeScript PROPERTIES LINK_FLAGS -Wl,--allow-multiple-definition)
+    set_target_properties(
+        NativeScript PROPERTIES LINK_FLAGS -Wl,--allow-multiple-definition
+        INTERFACE_INCLUDE_DIRECTORIES NATIVES_BLOB_INCLUDE_DIRECTORIES
+    )
 endif ()
 
 MESSAGE(STATUS "# General cmake Info")
@@ -180,7 +200,7 @@ 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_external_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)
@@ -194,10 +214,8 @@ target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID
 # you want to add. CMake verifies that the library exists before
 # completing its build.
 find_library(system-log log)
-find_library(system-android android)
-find_library(system-dl dl)
 find_library(system-z z)
 
 # Command info: https://cmake.org/cmake/help/v3.4/command/target_link_libraries.html
 # Specifies libraries CMake should link to your target library.
-target_link_libraries(NativeScript ${system-log} ${system-android} ${system-dl} ${system-z})
+target_link_libraries(NativeScript ${system-log} ${system-z})

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

@@ -37,7 +37,7 @@ android {
 
     defaultConfig {
         minSdkVersion 17
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 

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

@@ -451,6 +451,11 @@ Isolate* Runtime::PrepareV8Runtime(const string& filesPath, const string& native
 
     m_startupData = new StartupData();
 
+    auto* nativesBlobStartupData = new StartupData();
+    nativesBlobStartupData->data = reinterpret_cast<const char*>(&natives_blob_bin[0]);
+    nativesBlobStartupData->raw_size = natives_blob_bin_len;
+    V8::SetNativesDataBlob(nativesBlobStartupData);
+
     void* snapshotPtr = nullptr;
     string snapshotPath;
 
@@ -460,7 +465,7 @@ Isolate* Runtime::PrepareV8Runtime(const string& filesPath, const string& native
     } else {
         // If device is running on android Sdk 17
         // dlopen reads relative path to dynamic libraries or reads from folder different than the nativeLibsDirs on the android device
-        string snapshotPath = nativeLibDir + "/libsnapshot.so";
+        snapshotPath = nativeLibDir + "/libsnapshot.so";
     }
 
     snapshotPtr = dlopen(snapshotPath.c_str(), RTLD_LAZY | RTLD_LOCAL);
@@ -473,18 +478,19 @@ Isolate* Runtime::PrepareV8Runtime(const string& filesPath, const string& native
         }
     }
 
+    bool isCustomSnapshotFound = false;
     if (snapshotPtr) {
         m_startupData->data = static_cast<const char*>(dlsym(snapshotPtr, "TNSSnapshot_blob"));
         m_startupData->raw_size = *static_cast<const unsigned int*>(dlsym(snapshotPtr, "TNSSnapshot_blob_len"));
-        create_params.snapshot_blob = m_startupData;
+        V8::SetSnapshotDataBlob(m_startupData);
+        isCustomSnapshotFound = true;
         DEBUG_WRITE_FORCE("Snapshot library read %p (%dB).", m_startupData->data, m_startupData->raw_size);
     } else if (!Constants::V8_HEAP_SNAPSHOT_BLOB.empty() || !Constants::V8_HEAP_SNAPSHOT_SCRIPT.empty()) {
         DEBUG_WRITE_FORCE("Snapshot enabled.");
 
-        string snapshotPath;
         bool saveSnapshot = true;
         // we have a precompiled snapshot blob provided - try to load it directly
-        if (Constants::V8_HEAP_SNAPSHOT_BLOB.size() > 0) {
+        if (!Constants::V8_HEAP_SNAPSHOT_BLOB.empty()) {
             snapshotPath = Constants::V8_HEAP_SNAPSHOT_BLOB;
             saveSnapshot = false;
         } else {
@@ -495,8 +501,8 @@ Isolate* Runtime::PrepareV8Runtime(const string& filesPath, const string& native
             m_heapSnapshotBlob = new MemoryMappedFile(MemoryMappedFile::Open(snapshotPath.c_str()));
             m_startupData->data = static_cast<const char*>(m_heapSnapshotBlob->memory);
             m_startupData->raw_size = m_heapSnapshotBlob->size;
-            create_params.snapshot_blob = m_startupData;
-
+            V8::SetSnapshotDataBlob(m_startupData);
+            isCustomSnapshotFound = true;
             DEBUG_WRITE_FORCE("Snapshot read %s (%zuB).", snapshotPath.c_str(), m_heapSnapshotBlob->size);
         } else if (!saveSnapshot) {
             DEBUG_WRITE_FORCE("No snapshot file found at %s", snapshotPath.c_str());
@@ -509,7 +515,7 @@ Isolate* Runtime::PrepareV8Runtime(const string& filesPath, const string& native
             string customScript;
 
             // check for custom script to include in the snapshot
-            if (Constants::V8_HEAP_SNAPSHOT_SCRIPT.size() > 0 && File::Exists(Constants::V8_HEAP_SNAPSHOT_SCRIPT)) {
+            if (!Constants::V8_HEAP_SNAPSHOT_SCRIPT.empty() && File::Exists(Constants::V8_HEAP_SNAPSHOT_SCRIPT)) {
                 customScript = ReadFileText(Constants::V8_HEAP_SNAPSHOT_SCRIPT);
             }
 
@@ -530,10 +536,19 @@ Isolate* Runtime::PrepareV8Runtime(const string& filesPath, const string& native
                 }
             }
 
-            create_params.snapshot_blob = m_startupData;
+            V8::SetSnapshotDataBlob(m_startupData);
+            isCustomSnapshotFound = true;
         }
     }
 
+    if (!isCustomSnapshotFound) {
+        // Load V8's built-in snapshot
+        auto* snapshotBlobStartupData = new StartupData();
+        snapshotBlobStartupData->data = reinterpret_cast<const char*>(&snapshot_blob_bin[0]);
+        snapshotBlobStartupData->raw_size = snapshot_blob_bin_len;
+        V8::SetSnapshotDataBlob(snapshotBlobStartupData);
+    }
+
     /*
      * Setup the V8Platform only once per process - once for the application lifetime
      * Don't execute again if main thread has already been initialized
@@ -552,7 +567,7 @@ Isolate* Runtime::PrepareV8Runtime(const string& filesPath, const string& native
     m_objectManager->SetInstanceIsolate(isolate);
 
     // Sets a structure with v8 String constants on the isolate object at slot 1
-    V8StringConstants::PerIsolateV8Constants* consts = new V8StringConstants::PerIsolateV8Constants(isolate);
+    auto consts = new V8StringConstants::PerIsolateV8Constants(isolate);
     isolate->SetData((uint32_t)Runtime::IsolateData::CONSTANTS, consts);
 
     V8::SetFlagsFromString(Constants::V8_STARTUP_FLAGS.c_str(), Constants::V8_STARTUP_FLAGS.size());

test-app/runtime/CMakeLists.txt

@@ -11,6 +11,8 @@
 #include "ModuleInternal.h"
 #include "File.h"
 #include <mutex>
+#include <natives_blob.h>
+#include <snapshot_blob.h>
 
 jobject ConvertJsValueToJavaObject(tns::JEnv& env, const v8::Local<v8::Value>& value, int classReturnType);