Update v8 6.0.286.52 (#825)

* updated v8 includes

* update v8 x86, arm, arm64 binaries 

* update protocol

* update inspector protocol generated classes

* applied small fixes to protocol generated files

* fix inspector implementation problems caused by protocol api changes

* comment out redundant logic in the css agent inspector impl

* fix network agent inspector callbacks validation logic

* comment out native module test temporarily

* add lateset v8 version to runtime <-> v8 ver map

Author: petekanev

.gitignore

@@ -6,7 +6,9 @@ dist/
 /test-app/libs
 /test-app/metadata
 .idea
-
+.DS_Store
+.idea/
+*.iml
 local.properties
 
 gen/
@@ -15,4 +17,11 @@ obj/
 bin/
 .svn/
 
-**/.vscode/
+**/.vscode/
+
+### V8 platform build files
+
+/runtime/**/DEPS
+/runtime/**/OWNERS
+/runtime/**/*.gyp
+/runtime/**/*.gypi

.idea/gradle.xml

@@ -22,7 +22,7 @@ allprojects {
 def ndkDebuggable = false;
 def optimized = project.hasProperty("optimized")
 
-if(optimized) {
+if (optimized) {
     println "Optimized build triggered."
 }
 
@@ -34,7 +34,6 @@ for (String runTask : runTasks) {
     }
 }
 
-
 project.ext.sdkDir = System.getenv("ANDROID_HOME")
 def ndkDir = System.getenv("ANDROID_NDK_HOME")
 def propertiesFile = project.rootProject.file('local.properties')
@@ -46,110 +45,71 @@ if (propertiesFile.exists()) {
 project.ext.ndkDir = ndkDir;
 
 
-class StripSymbolsTaskExecutionListener implements TaskExecutionListener
-{
+class StripSymbolsTaskExecutionListener implements TaskExecutionListener {
     @Override
-    void beforeExecute(Task task)
-    {
+    void beforeExecute(Task task) {
     }
 
-    String getMachineName()
-    {
-        if (OperatingSystem.current().isWindows())
-        {
+    String getMachineName() {
+        if (OperatingSystem.current().isWindows()) {
             return "windows";
-        }
-        else if (OperatingSystem.current().isMacOsX())
-        {
+        } else if (OperatingSystem.current().isMacOsX()) {
             return "darwin";
-        }
-        else
-        {
+        } else {
             return "linux";
         }
     }
 
-    String getStripToolName(String stripTaskName)
-    {
+    String getStripToolName(String stripTaskName) {
         stripTaskName = stripTaskName.toLowerCase();
         def stripToolName = ""
-        if (stripTaskName.contains("arm64"))
-        {
+        if (stripTaskName.contains("arm64")) {
             stripToolName = "aarch64-linux-android-strip";
-        }
-        else if (stripTaskName.contains("arm"))
-        {
+        } else if (stripTaskName.contains("arm")) {
             stripToolName = "arm-linux-androideabi-strip";
-        }
-        else if (stripTaskName.contains("mips64"))
-        {
+        } else if (stripTaskName.contains("mips64")) {
             stripToolName = "mips64el-linux-android-strip";
-        }
-        else if (stripTaskName.contains("mips"))
-        {
+        } else if (stripTaskName.contains("mips")) {
             stripToolName = "mipsel-linux-android-strip";
-        }
-        else if (stripTaskName.contains("x86_64"))
-        {
+        } else if (stripTaskName.contains("x86_64")) {
             stripToolName = "x86_64-linux-android-strip";
-        }
-        else if (stripTaskName.contains("x86"))
-        {
+        } else if (stripTaskName.contains("x86")) {
             stripToolName = "i686-linux-android-strip";
-        }
-        else
-        {
+        } else {
             throw new IllegalArgumentException("NOT SUPPORTED ARCHITECTURE NAME: ${stripTaskName}");
         }
 
-        if (OperatingSystem.current().isWindows())
-        {
+        if (OperatingSystem.current().isWindows()) {
             stripToolName += ".exe";
         }
 
         return stripToolName;
     }
 
-    String getStripToolDirectory(String stripTaskName)
-    {
+    String getStripToolDirectory(String stripTaskName) {
         stripTaskName = stripTaskName.toLowerCase();
         def stripToolDirectory = ""
-        if (stripTaskName.contains("arm64"))
-        {
+        if (stripTaskName.contains("arm64")) {
             stripToolDirectory = "aarch64-linux-android-4.9";
-        }
-        else if (stripTaskName.contains("arm"))
-        {
+        } else if (stripTaskName.contains("arm")) {
             stripToolDirectory = "arm-linux-androideabi-4.9";
-        }
-        else if (stripTaskName.contains("mips64"))
-        {
+        } else if (stripTaskName.contains("mips64")) {
             stripToolDirectory = "mips64el-linux-android-4.9";
-        }
-        else if (stripTaskName.contains("mips"))
-        {
+        } else if (stripTaskName.contains("mips")) {
             stripToolDirectory = "mipsel-linux-android-4.9";
-        }
-        else if (stripTaskName.contains("x86_64"))
-        {
+        } else if (stripTaskName.contains("x86_64")) {
             stripToolDirectory = "x86_64-4.9";
-        }
-        else if (stripTaskName.contains("x86"))
-        {
+        } else if (stripTaskName.contains("x86")) {
             stripToolDirectory = "x86-4.9";
-        }
-        else
-        {
+        } else {
             throw new IllegalArgumentException("NOT SUPPORTED ARCHITECTURE: ${stripTaskName}");
         }
 
         return stripToolDirectory;
     }
 
-    void afterExecute(Task task, TaskState taskState)
-    {
-        if (task.getName().contains("stripSymbols") && !taskState.failure)
-        {
+    void afterExecute(Task task, TaskState taskState) {
+        if (task.getName().contains("stripSymbols") && !taskState.failure) {
             println "Found STRIP COMMAND: ${task.getName()}"
             println "input file " + task.getInputs().getFiles().getAsPath();
             println "output dir " + task.getOutputs().getFiles().getAsPath();
@@ -170,12 +130,9 @@ class StripSymbolsTaskExecutionListener implements TaskExecutionListener
             println "Strip tool: ${stripToolPath}"
 
             def command = "";
-            if (OperatingSystem.current().isWindows())
-            {
-                command =  "cmd /c ${stripToolPath} ${libToStripPath}";
-            }
-            else
-            {
+            if (OperatingSystem.current().isWindows()) {
+                command = "cmd /c ${stripToolPath} ${libToStripPath}";
+            } else {
                 command = "${stripToolPath} ${libToStripPath}";
             }
 
@@ -186,8 +143,7 @@ class StripSymbolsTaskExecutionListener implements TaskExecutionListener
     }
 }
 
-if (!ndkDebuggable)
-{
+if (!ndkDebuggable) {
     project.gradle.addListener(new StripSymbolsTaskExecutionListener())
 }
 
@@ -200,7 +156,7 @@ model {
         buildToolsVersion = project.ext._buildToolsVersion
 
         defaultConfig.with {
-            if(optimized) {
+            if (optimized) {
                 project.archivesBaseName = "${archivesBaseName}-optimized"
             } else {
                 project.archivesBaseName = "${archivesBaseName}-regular"
@@ -230,38 +186,35 @@ model {
                        "-I${file("src/main/jni/v8_inspector")}".toString(),
                        //"-I${file("src/main/jni/v8_inspector/platform/inspector_protocol/")}".toString(),
                        //"-I${file("src/main/jni/v8_inspector/protocol/")}".toString(),
-                       ])
+        ])
 
-        cppFlags.addAll(["-std=c++11", "-fexceptions", "-fno-builtin-stpcpy", "-DHAVE_INSPECTOR", "-D__ANDROID__"]) //, "-DV8_INSPECTOR_USE_STL=1", "-D__GXX_EXPERIMENTAL_CXX0X__=1"
+        cppFlags.addAll(["-std=c++11", "-fexceptions", "-fno-builtin-stpcpy", "-D__ANDROID__"])
+        //, "-DV8_INSPECTOR_USE_STL=1", "-D__GXX_EXPERIMENTAL_CXX0X__=1", "-DHAVE_INSPECTOR"
 
 
         CFlags.addAll(["-Wno-error=format-security", "-g", "-fno-builtin-stpcpy"])
 
         ldLibs.addAll(["android", "dl", "log", "atomic", "z"])
 
-        if(optimized) {
+        if (optimized) {
             ldFlags.addAll(["-Wl,--exclude-libs=ALL", "-Wl,--gc-sections"])
         }
         ldFlags.addAll(["-Wl,--allow-multiple-definition"])
 
         toolchain = "clang"
         stl = "c++_static"
 
-        abiFilters.addAll(["armeabi-v7a", "x86"])
+        abiFilters.addAll(["x86", "armeabi-v7a"])
 
-        if (System.getProperties()['idea.platform.prefix'] != null)
-        {
+        if (System.getProperties()['idea.platform.prefix'] != null) {
             // Built from AndroidStudio
             println "Build from AndroidStudio"
 
-            if (!ndkDebuggable)
-            {
+            if (!ndkDebuggable) {
                 abiFilters.addAll(["x86", "arm64-v8a"])
 
             }
-        }
-        else
-        {
+        } else {
             // Built from command line
             abiFilters.addAll(["x86", "arm64-v8a"])
 
@@ -311,8 +264,7 @@ model {
 
             tasks.whenTaskAdded { task ->
                 def taskName = task.getName()
-                if (taskName == "androidRelease")
-                {
+                if (taskName == "androidRelease") {
                     task.dependsOn(setRuntimeCommit)
                     task.mustRunAfter setRuntimeCommit
                     task.finalizedBy revertVersionFile
@@ -332,24 +284,28 @@ model {
         create("armeabi-v7a") {
             abiFilters.add("armeabi-v7a")
 
+            ldLibs.add("${file("src/main/libs/armeabi-v7a/libv8_base.a")}".toString())
+            ldLibs.add("${file("src/main/libs/armeabi-v7a/libv8_builtins_setup.a")}".toString())
+            ldLibs.add("${file("src/main/libs/armeabi-v7a/libv8_builtins_generators.a")}".toString())
             ldLibs.add("${file("src/main/libs/armeabi-v7a/libv8_base.a")}".toString())
             ldLibs.add("${file("src/main/libs/armeabi-v7a/libv8_libplatform.a")}".toString())
             ldLibs.add("${file("src/main/libs/armeabi-v7a/libv8_libbase.a")}".toString())
             ldLibs.add("${file("src/main/libs/armeabi-v7a/libv8_libsampler.a")}".toString())
             ldLibs.add("${file("src/main/libs/armeabi-v7a/libv8_nosnapshot.a")}".toString())
-            ldLibs.add("${file("src/main/libs/armeabi-v7a/libinspector.a")}".toString())
             ldLibs.add("${file("src/main/libs/armeabi-v7a/libzip.a")}".toString())
         }
 
         create("x86") {
             abiFilters.add("x86")
 
+            ldLibs.add("${file("src/main/libs/x86/libv8_base.a")}".toString())
+            ldLibs.add("${file("src/main/libs/x86/libv8_builtins_setup.a")}".toString())
+            ldLibs.add("${file("src/main/libs/x86/libv8_builtins_generators.a")}".toString())
             ldLibs.add("${file("src/main/libs/x86/libv8_base.a")}".toString())
             ldLibs.add("${file("src/main/libs/x86/libv8_libplatform.a")}".toString())
             ldLibs.add("${file("src/main/libs/x86/libv8_libbase.a")}".toString())
-            ldLibs.add("${file("src/main/libs/x86/libv8_libsampler.a")}".toString())
             ldLibs.add("${file("src/main/libs/x86/libv8_nosnapshot.a")}".toString())
-            ldLibs.add("${file("src/main/libs/x86/libinspector.a")}".toString())
+            ldLibs.add("${file("src/main/libs/x86/libv8_libsampler.a")}".toString())
             ldLibs.add("${file("src/main/libs/x86/libzip.a")}".toString())
         }
 
@@ -359,12 +315,15 @@ model {
             ldFlags.addAll([
                     "-L${file("src/main/libs/arm64-v8a")}".toString(),
                     "-lv8_base",
+                    "-lv8_builtins_setup",
+                    "-lv8_builtins_generators",
+                    "-lv8_base",
                     "-lv8_libplatform",
                     "-lv8_libbase",
                     "-lv8_libsampler",
                     "-lv8_nosnapshot",
-                    "-linspector",
-                    "-lzip"
+                    "-lzip",
+                    "-v"
             ])
 
             //The correct way of setting these flags is not working hence the workaround above
@@ -392,7 +351,8 @@ model {
                     staticLibraryFile = file("src/main/libs/${targetPlatform.getName()}/libv8_libbase.a")
                     staticLibraryFile = file("src/main/libs/${targetPlatform.getName()}/libv8_libsampler.a")
                     staticLibraryFile = file("src/main/libs/${targetPlatform.getName()}/libv8_nosnapshot.a")
-                    staticLibraryFile = file("src/main/libs/${targetPlatform.getName()}/libzip.a")
+                    staticLibraryFile = file("src/main/libs/${targetPlatform.getName()}/libv8_builtins_setup.a")
+                    staticLibraryFile = file("src/main/libs/${targetPlatform.getName()}/libv8_builtins_generators.a")
                 }
             }
         }

.idea/modules.xml

@@ -1,3 +1,3 @@
 {
-  "v8-version": "5.5.372.32"
+  "v8-version": "6.0.286.52"
 }

.idea/workspace.xml

@@ -39,10 +39,10 @@ void DOMDomainCallbackHandlers::ChildNodeInsertedCallback(const v8::FunctionCall
         auto lastId = args[1]->ToNumber(isolate);
         auto node = args[2]->ToString(isolate);
 
-        auto nodeJson = protocol::parseJSON(v8_inspector::toProtocolString(node));
+        auto nodeJson = protocol::StringUtil::parseJSON(v8_inspector::toProtocolString(node));
 
         protocol::ErrorSupport errorSupport;
-        auto domNode = protocol::DOM::Node::parse(nodeJson.get(), &errorSupport);
+        auto domNode = protocol::DOM::Node::fromValue(nodeJson.get(), &errorSupport);
 
         auto errorSupportString = errorSupport.errors().utf8();
         if (!errorSupportString.empty()) {