From 28b7bf062aae29f69c9dc6648f3153f716c6ae70 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Mon, 30 Oct 2017 14:20:11 +0100 Subject: [PATCH] deps: cherry-pick b8331cc030 from upstream V8 Original commit message: I believe the paths to the V8 include headers are incorrect. The paths to other sources seem to be relative to the parent directory. When building Node.js I get the following warning on Windows: Warning: Missing input files: deps\v8\src\..\..\include\v8-inspector-protocol.h deps\v8\src\..\..\include\v8-inspector.h This commit updates the two include paths. Bug: Change-Id: I51a057abba61e294e7811ba69db03e283b0bdc3f Reviewed-on: https://chromium-review.googlesource.com/743981 Reviewed-by: Aleksey Kozyatinskiy Commit-Queue: Aleksey Kozyatinskiy Cr-Commit-Position: refs/heads/master@{#49121} This commit also increments the v8_embedder_string version. PR-URL: https://github.com/nodejs/node/pull/16900 Fixes: https://github.com/nodejs/node/issues/16614 Refs: https://github.com/v8/v8/commit/b8331cc0303f7b5c18d84527d5951bafea9a46d9 Reviewed-By: Ben Noordhuis --- common.gypi | 2 +- deps/v8/src/inspector/inspector.gypi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common.gypi b/common.gypi index d152c81498858f..1d6bee1b6d7bc2 100644 --- a/common.gypi +++ b/common.gypi @@ -27,7 +27,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.8', + 'v8_embedder_string': '-node.9', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, diff --git a/deps/v8/src/inspector/inspector.gypi b/deps/v8/src/inspector/inspector.gypi index a08a041012bd18..bb96b0f610f8eb 100644 --- a/deps/v8/src/inspector/inspector.gypi +++ b/deps/v8/src/inspector/inspector.gypi @@ -31,8 +31,8 @@ 'inspector_all_sources': [ '<@(inspector_generated_sources)', '<(inspector_generated_injected_script)', - '../../include/v8-inspector.h', - '../../include/v8-inspector-protocol.h', + '../include/v8-inspector.h', + '../include/v8-inspector-protocol.h', 'inspector/injected-script.cc', 'inspector/injected-script.h', 'inspector/inspected-context.cc',