Skip to content

Commit

Permalink
chore: update patch indices
Browse files Browse the repository at this point in the history
  • Loading branch information
codebytere committed Jun 3, 2022
1 parent cb901ce commit 40c6295
Show file tree
Hide file tree
Showing 17 changed files with 45 additions and 45 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this
patch.

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index f1806b49a24c1f78b5a34f3c286e09671cb782d9..07be5296842515bff655846e33259fb662712007 100644
index b6234183651923505bd2a4a8640ea21508033ef1..e486f92e909f43bb65633245b7dcb3145d0a7604 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -175,11 +175,16 @@ if (!is_android && !is_mac) {
Expand All @@ -33,7 +33,7 @@ index f1806b49a24c1f78b5a34f3c286e09671cb782d9..07be5296842515bff655846e33259fb6
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index c064308807866c039a4160d47ef65bf84b5e954a..be100268336239a17a24bb6424fec427eaf3ab10 100644
index 1c21a9aa7c84aecf5253c23e00944514b9a3e32d..14a00be564a817f788c0b364dada20eec88fc30f 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4546,7 +4546,7 @@ static_library("browser") {
Expand All @@ -46,18 +46,18 @@ index c064308807866c039a4160d47ef65bf84b5e954a..be100268336239a17a24bb6424fec427
sources += [ "certificate_viewer_stub.cc" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 5f92e3b598fa3ad8767d20db975cb29329577613..9e122f609e67192c4fa58ed93d11dadc44c42b13 100644
index 1c1a7e5cdedf5842e72900af0dfc5a5102c582b2..90eb2e10f34a381797556b3acb35a5ac912375e1 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -5903,7 +5903,6 @@ test("unit_tests") {
@@ -5902,7 +5902,6 @@ test("unit_tests") {

deps += [
"//chrome:other_version",
- "//chrome:packed_resources_integrity",
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/browser:chrome_process_finder",
@@ -5926,6 +5925,10 @@ test("unit_tests") {
@@ -5925,6 +5924,10 @@ test("unit_tests") {
"//ui/resources",
]

Expand All @@ -68,7 +68,7 @@ index 5f92e3b598fa3ad8767d20db975cb29329577613..9e122f609e67192c4fa58ed93d11dadc
ldflags = [
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
@@ -6822,7 +6825,6 @@ test("unit_tests") {
@@ -6821,7 +6824,6 @@ test("unit_tests") {
}

deps += [
Expand Down
14 changes: 7 additions & 7 deletions patches/chromium/can_create_window.patch
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ index c0c99d3a664868858edffa5662b854337bef5feb..0fb248e89875b9b6040cf37c455c8ba5
&no_javascript_access);

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index f7b4b6764ccf5fb9250ed4153d1ee6221d184b89..a3c4510fea1bccded05181a2d3071ba4e781972b 100644
index 4893e261b7cfcd9828874b626797bc5bb3a3ffdc..1c2bf47241c6d54875501a065bf6fa380e8777a8 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3938,6 +3938,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -3942,6 +3942,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
}
auto* new_contents_impl = new_contents.get();

Expand All @@ -39,7 +39,7 @@ index f7b4b6764ccf5fb9250ed4153d1ee6221d184b89..a3c4510fea1bccded05181a2d3071ba4
new_contents_impl->GetController().SetSessionStorageNamespace(
partition_config, session_storage_namespace);

@@ -3982,12 +3990,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -3986,12 +3994,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
AddWebContentsDestructionObserver(new_contents_impl);
}

Expand Down Expand Up @@ -68,7 +68,7 @@ index bdcbb09cdd884dda769a5501e3dc94547f454be9..0b25def9601d8baadee6283f526687b3

// Operation result when the renderer asks the browser to create a new window.
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 08b6c6f89b4ec107c8ac459315f38eaf3fcc5c1a..ea55f2b41cc985a64e611d80caeb50cf5dc4a0fd 100644
index 69bcd725d0f86bf3b175fde86bd2dbd85b59f002..b72d89b19024a9074108dde4c5c9cd0f45b719bb 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -595,6 +595,8 @@ bool ContentBrowserClient::CanCreateWindow(
Expand All @@ -81,18 +81,18 @@ index 08b6c6f89b4ec107c8ac459315f38eaf3fcc5c1a..ea55f2b41cc985a64e611d80caeb50cf
bool opener_suppressed,
bool* no_javascript_access) {
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index c048f7e16d543312bc5fc5adc023b06aa05fb4f6..ab229b15262a3c598bd93529cc96cc78d93ae750 100644
index d0b7aed3162b8ea7673ab3ef31d2a3302f4e6456..6328fc21548f2b8277b461f9938dbcc50f6853f1 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -165,6 +165,7 @@ class NetworkService;
@@ -164,6 +164,7 @@ class NetworkService;
class TrustedURLLoaderHeaderClient;
} // namespace mojom
struct ResourceRequest;
+class ResourceRequestBody;
} // namespace network

namespace sandbox {
@@ -968,6 +969,8 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -967,6 +968,8 @@ class CONTENT_EXPORT ContentBrowserClient {
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,10 @@ index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b7
void AddNewContents(content::WebContents* source,
std::unique_ptr<content::WebContents> new_contents,
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 88837e2d1b63c416301f44e53bb08240d5d373a2..8439ea77e490d652fe4141462663ce46828373a0 100644
index 3f6089d824b32dfca68cac7c4982f0444d5f0972..7d84387c0b3bcf76091219847ee40e728e5d53c1 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3871,8 +3871,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -3875,8 +3875,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(

if (delegate_ && delegate_->IsWebContentsCreationOverridden(
source_site_instance, params.window_container_type,
Expand Down
4 changes: 2 additions & 2 deletions patches/chromium/disable_unload_metrics.patch
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ This patch temporarily disables the metrics so we can have green CI, and we
should continue seeking for a real fix.

diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
index ccf890a5e6577fd1834873971dd72cc816b2033e..abbe35ee1401711d0755418ec9132d21e18b9ba5 100644
index 0588899a89dda616a0d9e67f31652a53bbca2f82..17eb966009f2c10198602fb38dd5ac903da17ad2 100644
--- a/content/browser/renderer_host/navigator.cc
+++ b/content/browser/renderer_host/navigator.cc
@@ -1299,6 +1299,7 @@ void Navigator::RecordNavigationMetrics(
Expand All @@ -35,7 +35,7 @@ index ccf890a5e6577fd1834873971dd72cc816b2033e..abbe35ee1401711d0755418ec9132d21
// If this is a same-process navigation and we have timestamps for unload
// durations, fill those metrics out as well.
if (params.unload_start && params.unload_end &&
@@ -1345,6 +1346,7 @@ void Navigator::RecordNavigationMetrics(
@@ -1349,6 +1350,7 @@ void Navigator::RecordNavigationMetrics(
first_before_unload_start_time)
.InMilliseconds());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ index b2f873919d68633103d115d7d9550a098c1a254c..8e38831a6df15d37e5fb87d63613b7db

// Notifies that a swap has occurred and provides information about the pixel
diff --git a/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom b/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom
index a9a0e5a1167b2018e6dc206ecb7d37aad94042aa..3997ecb0228914144d6b04595c47376679fca3ef 100644
index 3c495dfe499e1bae90fa0d576d5f58f1300c17fa..678700882d379f528ee1d77819b063cfdcdad036 100644
--- a/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom
+++ b/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom
@@ -32,6 +32,7 @@ struct RootCompositorFrameSinkParams {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
to users. We should try to upstream this.

diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 89b6c1c89149ee2acae6fd8e42a20d50742ed21b..7ed644da4df3335b120ab1cd9dc576f3ac820220 100644
index 4c278081eaec0cdb5dac5e9fc3453de5ce04d918..888b8950f4849a5005f45ee4c4be3a481166540c 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -1823,7 +1823,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -1824,7 +1824,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
// IncrementCapturerCount() is destructed.
void DecrementCapturerCount(bool stay_hidden,
bool stay_awake,
Expand All @@ -21,10 +21,10 @@ index 89b6c1c89149ee2acae6fd8e42a20d50742ed21b..7ed644da4df3335b120ab1cd9dc576f3
// Calculates the PageVisibilityState for |visibility|, taking the capturing
// state into account.
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index d5c2a922bba0ff0d5a4a22d9cd25be46fd09d4e1..86eefb4d6e2d571965be9f40269b7f4fc633d26e 100644
index 53e264061c53ef48a7584939e47984ceab40fb8e..637d948784668a16f24a135a7e807e4933d7bfd1 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -673,6 +673,10 @@ class WebContents : public PageNavigator,
@@ -675,6 +675,10 @@ class WebContents : public PageNavigator,
bool stay_awake,
bool is_activity = true) = 0;

Expand Down
4 changes: 2 additions & 2 deletions patches/chromium/frame_host_manager.patch
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ index dd1e91e5d3f7cffafaf14116bd33aef2ce1aaa1f..b7fdd58a21a863bb5eb777be93521755
}

diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index ab229b15262a3c598bd93529cc96cc78d93ae750..2fe16e5bc73ffe510b9d64cc0b013a1e92b55b20 100644
index 6328fc21548f2b8277b461f9938dbcc50f6853f1..90058e16373ce92a9eede27f13010417cf51dae2 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -271,6 +271,11 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -270,6 +270,11 @@ class CONTENT_EXPORT ContentBrowserClient {

virtual ~ContentBrowserClient() = default;

Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/gtk_visibility.patch
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ index 349043f8a3cfc9f91cbae951e74258799a4fd126..0f7e3e544f524a7ad6660b54912cb119
# on GTK.
"//examples:peerconnection_client",
diff --git a/ui/ozone/platform/x11/BUILD.gn b/ui/ozone/platform/x11/BUILD.gn
index 252986ee44f9492ada6e11c08dea188bf17e741e..288ff1de7a09d501e0a86563c90e33d064517dac 100644
index b1180a85530a7dd65022e174fe335ede0c7c55ca..c12133d82b111d37c8bac92980c22e406125c8df 100644
--- a/ui/ozone/platform/x11/BUILD.gn
+++ b/ui/ozone/platform/x11/BUILD.gn
@@ -6,7 +6,7 @@ import("//build/config/chromeos/ui_mode.gni")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ index 9008af973427d7dab8170449bc5767cebc9d2e9e..e312287e4aca61b51a69c8413088f56f
properties->supports_global_application_menus = true;
properties->app_modal_dialogs_use_event_blocker = true;
diff --git a/ui/ozone/public/ozone_platform.h b/ui/ozone/public/ozone_platform.h
index df6b551b94bd4e04f4c0d6e976c68cc187a57d85..3b6dd20277af88568cdb17a7fddf89bdf89b5640 100644
index 22ba32317a74df24249d1528dcaaa28ff18bd0f4..fa57f97520a0327be2c7f5179591ca61b801c8b0 100644
--- a/ui/ozone/public/ozone_platform.h
+++ b/ui/ozone/public/ozone_platform.h
@@ -132,6 +132,10 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ index 273750752cdef18ccd7d54b9b28c524375bb3e8d..3eec2e5c14186b39a67ca8ad410a3268

void RenderWidgetHostImpl::ShowContextMenuAtPoint(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index a3c4510fea1bccded05181a2d3071ba4e781972b..88837e2d1b63c416301f44e53bb08240d5d373a2 100644
index 1c2bf47241c6d54875501a065bf6fa380e8777a8..3f6089d824b32dfca68cac7c4982f0444d5f0972 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4517,6 +4517,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
@@ -4521,6 +4521,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
return text_input_manager_.get();
}

Expand All @@ -59,10 +59,10 @@ index a3c4510fea1bccded05181a2d3071ba4e781972b..88837e2d1b63c416301f44e53bb08240
RenderWidgetHostImpl* render_widget_host) {
return render_widget_host == GetMainFrame()->GetRenderWidgetHost();
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 67c316823ec8e0b8b8848475fedadaa013242464..89b6c1c89149ee2acae6fd8e42a20d50742ed21b 100644
index 4d6a72ac7eebfc27a97f7c269324129dfc7c534d..4c278081eaec0cdb5dac5e9fc3453de5ce04d918 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -957,6 +957,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -958,6 +958,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
void SendScreenRects() override;
void SendActiveState(bool active) override;
TextInputManager* GetTextInputManager() override;
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/resource_file_conflict.patch
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Some alternatives to this patch:
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 6c601569898cc24ede87154f2130b4bc56d0932f..f1806b49a24c1f78b5a34f3c286e09671cb782d9 100644
index abbbfc5db4d63d6b31a062e0394438354030f3e8..b6234183651923505bd2a4a8640ea21508033ef1 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1539,7 +1539,7 @@ if (is_chrome_branded && !is_android) {
Expand Down
6 changes: 3 additions & 3 deletions patches/chromium/support_mixed_sandbox_with_zygote.patch
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ index acb485c6f1c1daf2759d6315d9edd533fb4a7ec9..badf9f1b75b929970c503843dc273367

auto file_data = std::make_unique<ChildProcessLauncherFileData>();
diff --git a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
index 2c4bd947eca08223c541de53390a18d19208397e..6ef28fe7ebfd3dfa60995184772e3e2dd6f7f0d8 100644
index af8173d4203150237387529aa2b974aeec7c5a41..9fadaa80a4547a583484355342c3fd98d53bcd27 100644
--- a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
+++ b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
@@ -31,6 +31,9 @@ namespace content {
Expand All @@ -55,7 +55,7 @@ index 2c4bd947eca08223c541de53390a18d19208397e..6ef28fe7ebfd3dfa60995184772e3e2d
const base::CommandLine& browser_command_line =
*base::CommandLine::ForCurrentProcess();
base::CommandLine::StringType renderer_prefix =
@@ -60,6 +60,9 @@ RendererSandboxedProcessLauncherDelegateWin::
@@ -60,6 +63,9 @@ RendererSandboxedProcessLauncherDelegateWin::
GetContentClient()->browser()->IsRendererCodeIntegrityEnabled()),
renderer_app_container_disabled_(
GetContentClient()->browser()->IsRendererAppContainerDisabled()) {
Expand All @@ -66,7 +66,7 @@ index 2c4bd947eca08223c541de53390a18d19208397e..6ef28fe7ebfd3dfa60995184772e3e2d
dynamic_code_can_be_disabled_ = true;
return;
diff --git a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
index 576a2c0782bf49cb57c973434b5d1f2ec9fdcbc5..24d1854c261372353c9bf69a6cb0cf2d24e9ebef 100644
index 3a0e25b38965de5b57fd0be1112cf62dfda846d7..f412080cfb49330d855fdf1cbc13ff8850530401 100644
--- a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
+++ b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
@@ -18,6 +18,11 @@ class CONTENT_EXPORT RendererSandboxedProcessLauncherDelegate
Expand Down
8 changes: 4 additions & 4 deletions patches/chromium/web_contents.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ is needed for OSR.
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 8439ea77e490d652fe4141462663ce46828373a0..2799b1fab10377fda64cbb8db93301f5f0c5271e 100644
index 7d84387c0b3bcf76091219847ee40e728e5d53c1..ea819c1676c7e23506321a7d6520e8063fd639b3 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3027,6 +3027,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3031,6 +3031,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
site_instance.get(), params.renderer_initiated_creation,
params.main_frame_name, GetOpener(), primary_main_frame_policy);

Expand All @@ -26,7 +26,7 @@ index 8439ea77e490d652fe4141462663ce46828373a0..2799b1fab10377fda64cbb8db93301f5
std::unique_ptr<WebContentsViewDelegate> delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);

@@ -3037,6 +3044,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3041,6 +3048,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_ = CreateWebContentsView(this, std::move(delegate),
&render_view_host_delegate_view_);
}
Expand All @@ -35,7 +35,7 @@ index 8439ea77e490d652fe4141462663ce46828373a0..2799b1fab10377fda64cbb8db93301f5
CHECK(view_.get());

diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index e82a5b71eb8a6ee2df8478ccd3432b4afbb096aa..d5c2a922bba0ff0d5a4a22d9cd25be46fd09d4e1 100644
index c98dd2d9a23a0a69a8c0d401e810c79f29308cea..53e264061c53ef48a7584939e47984ceab40fb8e 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -93,10 +93,13 @@ class BrowserContext;
Expand Down
2 changes: 1 addition & 1 deletion patches/v8/allow_disabling_of_v8_sandboxed_pointers.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ https://chromium-review.googlesource.com/c/v8/v8/+/3114136, so for
now we need a way to disable v8 sandboxed pointers.

diff --git a/BUILD.gn b/BUILD.gn
index f3b269bf948d7c8cb1b9c9157fc91924a5336ffc..4beb0cc5ff13cd5c8509ce7ef7c95150982650db 100644
index 8c6ac4f405e8f1ddadb4e59db421898482683335..4cf7b3b94b878383b7f76b200cfabc2646d98e5c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -508,9 +508,9 @@ if (v8_enable_sandbox == "") {
Expand Down
6 changes: 3 additions & 3 deletions patches/v8/build_gn.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ necessary for native modules to load.
Also, some fixes relating to mksnapshot on ARM.

diff --git a/BUILD.gn b/BUILD.gn
index adffeec107f8455ad6e4e7c0ccb1d9feb5e42df4..43efd9c09d5d64e4131325b3326ca7723a3e58f6 100644
index 7800b39d303056200625ea0c2cae987cd26a3a10..b61fcd6b339dfbd20d05098b8bf305f512237d0c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -623,7 +623,7 @@ config("internal_config") {
Expand All @@ -21,7 +21,7 @@ index adffeec107f8455ad6e4e7c0ccb1d9feb5e42df4..43efd9c09d5d64e4131325b3326ca772
defines += [ "BUILDING_V8_SHARED" ]
}

@@ -5932,7 +5932,7 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -5937,7 +5937,7 @@ if (current_toolchain == v8_generator_toolchain) {
"src/interpreter/bytecodes.h",
]

Expand All @@ -30,7 +30,7 @@ index adffeec107f8455ad6e4e7c0ccb1d9feb5e42df4..43efd9c09d5d64e4131325b3326ca772

deps = [
":v8_libbase",
@@ -5970,6 +5970,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
@@ -5975,6 +5975,8 @@ if (current_toolchain == v8_snapshot_toolchain) {

configs = [ ":internal_config" ]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
contain any standard C++ library exports (e.g. `std::ostringstream`).

diff --git a/BUILD.gn b/BUILD.gn
index aa0d29f6ba3059d384e877068ad1aa2a6429a334..f3b269bf948d7c8cb1b9c9157fc91924a5336ffc 100644
index 9fa39df53724223d0eb51351e22a377827ad0393..8c6ac4f405e8f1ddadb4e59db421898482683335 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -623,6 +623,10 @@ config("internal_config") {
Expand Down

0 comments on commit 40c6295

Please sign in to comment.