From 51c8fbb68665b75ccbb588e220cdddf09b2892c1 Mon Sep 17 00:00:00 2001 From: Cheng Date: Thu, 30 Jan 2025 15:44:39 +0900 Subject: [PATCH] inspector: fix GN build PR-URL: https://github.com/nodejs/node/pull/56798 Reviewed-By: Chengzhong Wu Reviewed-By: James M Snell --- src/inspector/unofficial.gni | 37 +++++++++++++++++++++++++++++++++++- unofficial.gni | 1 + 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/inspector/unofficial.gni b/src/inspector/unofficial.gni index 5d87f3c901ab50..3d7aa148678b26 100644 --- a/src/inspector/unofficial.gni +++ b/src/inspector/unofficial.gni @@ -13,7 +13,7 @@ template("inspector_gn_build") { } node_gen_dir = get_label_info("../..", "target_gen_dir") - protocol_tool_path = "../../tools/inspector_protocol" + protocol_tool_path = "../../deps/inspector_protocol" gypi_values = exec_script( "../../tools/gypi_to_gn.py", @@ -35,6 +35,8 @@ template("inspector_gn_build") { ] args = [ + "--inspector_protocol_dir", + rebase_path(protocol_tool_path, root_build_dir), "--jinja_dir", # jinja is in third_party. rebase_path("//third_party/", root_build_dir), @@ -72,4 +74,37 @@ template("inspector_gn_build") { outputs = [ "$node_gen_dir/src/{{source_name_part}}.json" ] args = [ "{{source}}" ] + rebase_path(outputs, root_build_dir) } + + config("crdtp_config") { + include_dirs = [ protocol_tool_path ] + } + + static_library("crdtp") { + public_configs = [ ":crdtp_config" ] + sources = [ + "$protocol_tool_path/crdtp/cbor.cc", + "$protocol_tool_path/crdtp/cbor.h", + "$protocol_tool_path/crdtp/dispatch.cc", + "$protocol_tool_path/crdtp/dispatch.h", + "$protocol_tool_path/crdtp/error_support.cc", + "$protocol_tool_path/crdtp/error_support.h", + "$protocol_tool_path/crdtp/export.h", + "$protocol_tool_path/crdtp/find_by_first.h", + "$protocol_tool_path/crdtp/frontend_channel.h", + "$protocol_tool_path/crdtp/glue.h", + "$protocol_tool_path/crdtp/json.cc", + "$protocol_tool_path/crdtp/json.h", + "$protocol_tool_path/crdtp/parser_handler.h", + "$protocol_tool_path/crdtp/protocol_core.cc", + "$protocol_tool_path/crdtp/protocol_core.h", + "$protocol_tool_path/crdtp/serializable.cc", + "$protocol_tool_path/crdtp/serializable.h", + "$protocol_tool_path/crdtp/span.cc", + "$protocol_tool_path/crdtp/span.h", + "$protocol_tool_path/crdtp/status.cc", + "$protocol_tool_path/crdtp/status.h", + "$protocol_tool_path/crdtp/json_platform.cc", + "$protocol_tool_path/crdtp/json_platform.h", + ] + } } diff --git a/unofficial.gni b/unofficial.gni index 193a0d8ff2df5e..5149514ac4894f 100644 --- a/unofficial.gni +++ b/unofficial.gni @@ -190,6 +190,7 @@ template("node_gn_build") { } if (node_enable_inspector) { deps += [ + "src/inspector:crdtp", "src/inspector:node_protocol_generated_sources", "src/inspector:v8_inspector_compress_protocol_json", ]