Commit 7e9448ed authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

Revert "Remove no_custom_libcxx and update V8 DEPS."

This reverts commit b8092f43.

Reason for revert: Seems to crash all tests on arm debug:
https://chromium-swarm.appspot.com/task?id=39df3b647e100a10&refresh=10&show_raw=1

Original change's description:
> Remove no_custom_libcxx and update V8 DEPS.
> 
> Rolling v8/build: https://chromium.googlesource.com/chromium/src/build/+log/98bbbff..5698e23
> 
> Rolling v8/buildtools: https://chromium.googlesource.com/chromium/buildtools/+log/93a751e..9c40f80
> 
> Rolling v8/third_party/catapult: https://chromium.googlesource.com/catapult/+log/755a485..fd88dfb
> 
> Rolling v8/tools/clang: https://chromium.googlesource.com/chromium/src/tools/clang/+log/4b58512..e70074d
> 
> R=​machenbach@chromium.org,hablich@chromium.org,sergiyb@chromium.org
> 
> Change-Id: I659fc77cdada9b96c42b9b7ea86766b47b6f8352
> Reviewed-on: https://chromium-review.googlesource.com/775320
> Reviewed-by: Michael Achenbach <machenbach@chromium.org>
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#49428}

TBR=machenbach@chromium.org,hablich@chromium.org,sergiyb@chromium.org,thomasanderson@chromium.org

Change-Id: I9a6210bfdea9ad0d0a344a97bf0ce63d13e90288
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/775159Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49432}
parent d51f4c82
......@@ -9,7 +9,7 @@ vars = {
deps = {
'v8/build':
Var('chromium_url') + '/chromium/src/build.git' + '@' + '5698e2328ae36ada2784ea67195d8a3731c7a464',
Var('chromium_url') + '/chromium/src/build.git' + '@' + '98bbbff4731a0b844cb0e77a7afdb955329826b3',
'v8/tools/gyp':
Var('chromium_url') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
'v8/third_party/icu':
......@@ -17,7 +17,7 @@ deps = {
'v8/third_party/instrumented_libraries':
Var('chromium_url') + '/chromium/src/third_party/instrumented_libraries.git' + '@' + 'e07d437dc8b65ca96ebd3b7d4aa303cd2ec0ec45',
'v8/buildtools':
Var('chromium_url') + '/chromium/buildtools.git' + '@' + '9c40f80c99981e0e3b8ab444ead3d8de8751c103',
Var('chromium_url') + '/chromium/buildtools.git' + '@' + '93a751e41bd93e373548759c6c5453bd95b6f35e',
'v8/base/trace_event/common':
Var('chromium_url') + '/chromium/src/base/trace_event/common.git' + '@' + '0e9a47d74970bee1bbfc063c47215406f8918699',
'v8/third_party/android_tools': {
......@@ -25,7 +25,7 @@ deps = {
'condition': 'checkout_android',
},
'v8/third_party/catapult': {
'url': Var('chromium_url') + '/catapult.git' + '@' + 'fd88dfbfa2217a44f0860dbb718d0c04e6576089',
'url': Var('chromium_url') + '/catapult.git' + '@' + '755a485cfb8a6e9010cdcf106933236aad114832',
'condition': 'checkout_android',
},
'v8/third_party/colorama/src': {
......@@ -51,7 +51,7 @@ deps = {
'v8/test/test262/harness':
Var('chromium_url') + '/external/github.com/test262-utils/test262-harness-py.git' + '@' + '0f2acdd882c84cff43b9d60df7574a1901e2cdcd',
'v8/tools/clang':
Var('chromium_url') + '/chromium/src/tools/clang.git' + '@' + 'e70074db10b27867e6c873adc3ac7e5f9ee0ff6e',
Var('chromium_url') + '/chromium/src/tools/clang.git' + '@' + '4b585122606d6daecc97b89b69f0f3454afb170a',
'v8/tools/luci-go':
Var('chromium_url') + '/chromium/src/tools/luci-go.git' + '@' + '45a8a51fda92e123619a69e7644d9c64a320b0c1',
'v8/test/wasm-js':
......
......@@ -375,7 +375,8 @@
# GN debug configs for arm.
'gn_debug_arm': [
'gn', 'debug_bot', 'arm', 'crosscompile', 'hard_float', 'swarming'],
'gn', 'debug_bot', 'arm', 'crosscompile', 'hard_float', 'swarming',
'no_custom_libcxx'],
# GN release configs for arm.
'gn_release_arm': [
......@@ -675,6 +676,11 @@
'gn_args': 'is_clang=false',
},
# TODO(machenbach): Remove when http://crbug.com/738814 is resolved.
'no_custom_libcxx': {
'gn_args': 'use_custom_libcxx=false',
},
'release': {
'gn_args': 'is_debug=false',
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment