nodejs
diff --git a/Collapse file
‎common.gypi‎
Copy file name to clipboardExpand all lines: common.gypi
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎common.gypi‎
Copy file name to clipboardExpand all lines: common.gypi
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎deps/v8/DEPS‎
Copy file name to clipboardExpand all lines: deps/v8/DEPS
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎deps/v8/DEPS‎
Copy file name to clipboardExpand all lines: deps/v8/DEPS
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎deps/v8/gni/proto_library.gni‎
Copy file name to clipboardExpand all lines: deps/v8/gni/proto_library.gni
+6-5Lines changed: 6 additions & 5 deletions b/Collapse file
‎deps/v8/gni/proto_library.gni‎
Copy file name to clipboardExpand all lines: deps/v8/gni/proto_library.gni
+6-5Lines changed: 6 additions & 5 deletions
diff --git a/Collapse file
‎deps/v8/test/cctest/libplatform/test-tracing.cc‎
Copy file name to clipboardExpand all lines: deps/v8/test/cctest/libplatform/test-tracing.cc
+5-4Lines changed: 5 additions & 4 deletions b/Collapse file
‎deps/v8/test/cctest/libplatform/test-tracing.cc‎
Copy file name to clipboardExpand all lines: deps/v8/test/cctest/libplatform/test-tracing.cc
+5-4Lines changed: 5 additions & 4 deletions
@@ -34,7 +34,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.47',
+    'v8_embedder_string': '-node.48',
 
     ##### V8 defaults for Node.js #####
 
 
@@ -246,7 +246,7 @@ deps = {
     'dep_type': 'cipd',
   },
   'v8/third_party/perfetto':
-    Var('android_url') + '/platform/external/perfetto.git' + '@' + '01615892494a9a8dc84414962d0a817bf97de2c2',
+    Var('android_url') + '/platform/external/perfetto.git' + '@' + '7cdc44f903d3bcfd1d0f67188bfa797a24756868',
   'v8/third_party/protobuf':
     Var('chromium_url') + '/external/github.com/google/protobuf'+ '@' + 'b68a347f56137b4b1a746e8c7438495a6ac1bd91',
 }
 
@@ -11,8 +11,6 @@ template("proto_library") {
   assert(defined(invoker.sources))
   proto_sources = invoker.sources
 
-  set_sources_assignment_filter([])
-
   if (host_os == "win") {
     host_executable_suffix = ".exe"
   } else {
@@ -137,6 +135,12 @@ template("proto_library") {
       ]
     }
 
+    if (defined(invoker.import_dirs)) {
+      foreach(path, invoker.import_dirs) {
+        args += [ "--import-dir=" + rebase_path(path, root_build_dir) ]
+      }
+    }
+
     if (generate_with_plugin) {
       plugin_path_rebased = rebase_path(plugin_path, root_build_dir)
       plugin_out_args = ""
@@ -187,10 +191,7 @@ template("proto_library") {
                              "visibility",
                            ])
 
-    # Exclude the config.descriptor file which is an output for some reason.
-    set_sources_assignment_filter([ "*.descriptor" ])
     sources = get_target_outputs(":$action_name")
-    set_sources_assignment_filter(sources_assignment_filter)
 
     # configs -= [ "//gn/standalone:extra_warnings" ]
     if (defined(invoker.extra_configs)) {
 
@@ -891,10 +891,11 @@ TEST(JsonIntegrationTest) {
   std::vector<std::string> all_args;
   GetJSONStrings(&all_args, json, "\"args\"", "{", "}");
 
-  CHECK_EQ("\"1\":1e+100", all_args[0]);
-  CHECK_EQ("\"2\":\"NaN\"", all_args[1]);
-  CHECK_EQ("\"3\":\"Infinity\"", all_args[2]);
-  CHECK_EQ("\"4\":\"-Infinity\"", all_args[3]);
+  // Ignore the first metadata event.
+  CHECK_EQ("\"1\":1e+100", all_args[1]);
+  CHECK_EQ("\"2\":\"NaN\"", all_args[2]);
+  CHECK_EQ("\"3\":\"Infinity\"", all_args[3]);
+  CHECK_EQ("\"4\":\"-Infinity\"", all_args[4]);
 }
 
 TEST(TracingPerfetto) {