AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[build] Remove catapult dependency for node.js

Browse Source 
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 <machenbach@chromium.org>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#56364}
This commit is contained in:
Michael Achenbach 2018-10-04 09:43:23 +02:00 committed by Commit Bot
parent f537d77845
commit 26f6e418ff
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DEPS
View File

@ -34,6 +34,7 @@ deps = {
}, },
'v8/third_party/catapult': { 'v8/third_party/catapult': {
'url': Var('chromium_url') + '/catapult.git' + '@' + '2dd914402ebcc44ecb60034e5c7b9bfa3d0c9d89', 'url': Var('chromium_url') + '/catapult.git' + '@' + '2dd914402ebcc44ecb60034e5c7b9bfa3d0c9d89',
'condition': 'checkout_android',
}, },
'v8/third_party/colorama/src': { 'v8/third_party/colorama/src': {
'url': Var('chromium_url') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'url': Var('chromium_url') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',

3
tools/node/fetch_deps.py
View File

@ -35,8 +35,7 @@ GCLIENT_SOLUTION = [
"v8/test/wasm-js" : None, "v8/test/wasm-js" : None,
"v8/third_party/android_ndk" : None, "v8/third_party/android_ndk" : None,
"v8/third_party/android_tools" : 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/colorama/src" : None,
"v8/third_party/fuchsia-sdk" : None, "v8/third_party/fuchsia-sdk" : None,
"v8/third_party/instrumented_libraries" : None, "v8/third_party/instrumented_libraries" : None,

1
tools/node/update_node.py
View File

@ -34,7 +34,6 @@ import node_common
TARGET_SUBDIR = os.path.join("deps", "v8") TARGET_SUBDIR = os.path.join("deps", "v8")
SUB_REPOSITORIES = [ ["base", "trace_event", "common"], SUB_REPOSITORIES = [ ["base", "trace_event", "common"],
["third_party", "catapult"],
["third_party", "googletest", "src"] ] ["third_party", "googletest", "src"] ]
DELETE_FROM_GITIGNORE = [ "/base", DELETE_FROM_GITIGNORE = [ "/base",