From 7783c50a1dd35d12e7337698abd877b189cd6ae2 Mon Sep 17 00:00:00 2001 From: Ayushman Chhabra Date: Fri, 3 Mar 2023 03:46:52 -0500 Subject: [PATCH 1/5] Fix build error when building Node --- build/util/version.gypi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/util/version.gypi b/build/util/version.gypi index 327a5c2e5f596..aa032653d8cbc 100644 --- a/build/util/version.gypi +++ b/build/util/version.gypi @@ -13,8 +13,8 @@ 'version_path': '<(version_path)', 'lastchange_path': '<(lastchange_path)', 'version_full': - ' Date: Thu, 9 Mar 2023 22:26:23 -0500 Subject: [PATCH 2/5] git ignore node-nw and gyp --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 46012e02f65b4..41e641d97fef6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ /client-py/ /content/nw +/third_party/node-nw +/tools/gyp *.bak *.code-workspace *.gstmp From 81ae6ec43c7df335f1e28d4ad84d94c05526c26c Mon Sep 17 00:00:00 2001 From: Ayushman Chhabra Date: Thu, 9 Mar 2023 23:19:53 -0500 Subject: [PATCH 3/5] build: fix component build --- headless/BUILD.gn | 7 ------- 1 file changed, 7 deletions(-) diff --git a/headless/BUILD.gn b/headless/BUILD.gn index 1dc3c2f3bc10b..67415a4ee9496 100644 --- a/headless/BUILD.gn +++ b/headless/BUILD.gn @@ -909,13 +909,6 @@ static_library("headless_shell_lib") { deps += [ "//components/crash/content/browser" ] } - if ((is_linux || is_mac) && is_component_build) { - sources += [ - "app/headless_shell_switches.cc", - "app/headless_shell_switches.h", - ] - } - if (enable_printing) { deps += [ "//components/printing/browser", From 7e4ab32cc940020668147f20f0dd4c53075475f0 Mon Sep 17 00:00:00 2001 From: tharatau Date: Wed, 15 Mar 2023 01:57:38 -0400 Subject: [PATCH 4/5] build: revert out of scope change --- headless/BUILD.gn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/headless/BUILD.gn b/headless/BUILD.gn index 67415a4ee9496..54a02f2331371 100644 --- a/headless/BUILD.gn +++ b/headless/BUILD.gn @@ -908,6 +908,13 @@ static_library("headless_shell_lib") { if (!is_fuchsia) { deps += [ "//components/crash/content/browser" ] } + + if ((is_linux || is_mac) && is_component_build) { + sources += [ + "app/headless_shell_switches.cc", + "app/headless_shell_switches.h", + ] + } if (enable_printing) { deps += [ From 205f4015e5059892f6c8c360f17f069a66289421 Mon Sep 17 00:00:00 2001 From: tharatau Date: Wed, 15 Mar 2023 01:58:34 -0400 Subject: [PATCH 5/5] build: revert another out of scope change --- headless/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/headless/BUILD.gn b/headless/BUILD.gn index 54a02f2331371..d1130b5c45fb1 100644 --- a/headless/BUILD.gn +++ b/headless/BUILD.gn @@ -908,7 +908,6 @@ static_library("headless_shell_lib") { if (!is_fuchsia) { deps += [ "//components/crash/content/browser" ] } - if ((is_linux || is_mac) && is_component_build) { sources += [ "app/headless_shell_switches.cc",