From b565af2edc424709a65138bd45d125dc5448b465 Mon Sep 17 00:00:00 2001 From: Ayushman Chhabra Date: Sat, 1 Apr 2023 04:47:13 -0400 Subject: [PATCH 1/4] chore: git ignore `gyp` and `node` --- third_party/.gitignore | 1 + tools/.gitignore | 1 + 2 files changed, 2 insertions(+) diff --git a/third_party/.gitignore b/third_party/.gitignore index 24c302f31b755..a94d2a89f3ddd 100644 --- a/third_party/.gitignore +++ b/third_party/.gitignore @@ -198,6 +198,7 @@ /node/mac /node/node_modules /node/win +/node-nw /nss /objenesis/lib/ /omaha/src/omaha diff --git a/tools/.gitignore b/tools/.gitignore index b70f6a3860608..4d73024177cd5 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -1 +1,2 @@ bazel +gyp \ No newline at end of file From 15a9c6264ca052dee034cc0d09c27ec20c49c3d6 Mon Sep 17 00:00:00 2001 From: Ayushman Chhabra Date: Sat, 1 Apr 2023 19:25:28 -0400 Subject: [PATCH 2/4] fix(build): remove redundant build rule in headless --- 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 2735caf976de4add6f0d6293c1c1e06cdf1c5065 Mon Sep 17 00:00:00 2001 From: Ayushman Chhabra Date: Sun, 2 Apr 2023 18:35:47 -0400 Subject: [PATCH 3/4] fix(build): python not found error --- 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: Mon, 17 Apr 2023 21:07:30 -0400 Subject: [PATCH 4/4] [GYP] `python3` -> `python` Following Chromium's Python migration guidelines: https://chromium.googlesource.com/chromium/src/+/HEAD/docs/python3_migration.md --- 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 aa032653d8cbc..327a5c2e5f596 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': - '