From 26f6e418ffbc8bdfb99156664cc90fe0b0ba1d99 Mon Sep 17 00:00:00 2001 From: Michael Achenbach Date: Thu, 4 Oct 2018 09:43:23 +0200 Subject: [PATCH] [build] Remove catapult dependency for node.js This undoes the workaround from https://crrev.com/c/1223426. Bug: chromium:887888 Change-Id: Id7a68354b1f1020d7d001ba4120be8a11f896067 Reviewed-on: https://chromium-review.googlesource.com/c/1260942 Commit-Queue: Michael Achenbach Reviewed-by: Yang Guo Cr-Commit-Position: refs/heads/master@{#56364} --- DEPS | 1 + tools/node/fetch_deps.py | 3 +-- tools/node/update_node.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index 4804950e86..c7b9c49e91 100644 --- a/DEPS +++ b/DEPS @@ -34,6 +34,7 @@ deps = { }, 'v8/third_party/catapult': { 'url': Var('chromium_url') + '/catapult.git' + '@' + '2dd914402ebcc44ecb60034e5c7b9bfa3d0c9d89', + 'condition': 'checkout_android', }, 'v8/third_party/colorama/src': { 'url': Var('chromium_url') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', diff --git a/tools/node/fetch_deps.py b/tools/node/fetch_deps.py index 6e2c5cc2d2..7f34bb4179 100755 --- a/tools/node/fetch_deps.py +++ b/tools/node/fetch_deps.py @@ -35,8 +35,7 @@ GCLIENT_SOLUTION = [ "v8/test/wasm-js" : None, "v8/third_party/android_ndk" : None, "v8/third_party/android_tools" : None, - # V8 currently depends indirectly on catapult. See crbug/887888. - # "v8/third_party/catapult" : None, + "v8/third_party/catapult" : None, "v8/third_party/colorama/src" : None, "v8/third_party/fuchsia-sdk" : None, "v8/third_party/instrumented_libraries" : None, diff --git a/tools/node/update_node.py b/tools/node/update_node.py index 7d08b1d969..fb3c2a0aec 100755 --- a/tools/node/update_node.py +++ b/tools/node/update_node.py @@ -34,7 +34,6 @@ import node_common TARGET_SUBDIR = os.path.join("deps", "v8") SUB_REPOSITORIES = [ ["base", "trace_event", "common"], - ["third_party", "catapult"], ["third_party", "googletest", "src"] ] DELETE_FROM_GITIGNORE = [ "/base",