From b394a4c1d9ef4b162bed97336aed8d309e821587 Mon Sep 17 00:00:00 2001 From: ssanfilippo Date: Fri, 8 Apr 2016 06:01:56 -0700 Subject: [PATCH] Version 5.1.281.3 (cherry-pick) Merged 2f8de2e80a781c17bfad5aed14ed937dc082c6ac Fix Gyp rule that broke node.js build after snapshot log removal. R=hablich@chromium.org NOTRY=true NOPRESUBMIT=true Review URL: https://codereview.chromium.org/1870103002 Cr-Commit-Position: refs/branch-heads/5.1@{#6} Cr-Branched-From: 167dc63b4c9a1d0f0fe1b19af93644ac9a561e83-refs/heads/5.1.281@{#1} Cr-Branched-From: 03953f52bd4a184983a551927c406be6489ef89b-refs/heads/master@{#35282} --- include/v8-version.h | 2 +- tools/gyp/v8.gyp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/v8-version.h b/include/v8-version.h index cdddd174880..1c5729d4f25 100644 --- a/include/v8-version.h +++ b/include/v8-version.h @@ -11,7 +11,7 @@ #define V8_MAJOR_VERSION 5 #define V8_MINOR_VERSION 1 #define V8_BUILD_NUMBER 281 -#define V8_PATCH_LEVEL 2 +#define V8_PATCH_LEVEL 3 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp index e0fd8ebebe9..b09fd1f2896 100644 --- a/tools/gyp/v8.gyp +++ b/tools/gyp/v8.gyp @@ -211,6 +211,7 @@ '<(INTERMEDIATE_DIR)/snapshot.cc', ], 'variables': { + 'mksnapshot_flags': [], 'conditions': [ ['v8_random_seed!=0', { 'mksnapshot_flags': ['--random-seed', '<(v8_random_seed)'], @@ -370,6 +371,7 @@ 'action_name': 'run_mksnapshot (external)', 'inputs': ['<(mksnapshot_exec)'], 'variables': { + 'mksnapshot_flags': [], 'conditions': [ ['v8_random_seed!=0', { 'mksnapshot_flags': ['--random-seed', '<(v8_random_seed)'],