From 96f3ca13b0ad91b0fd84733be0633b75a40e2fe1 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Fri, 9 Feb 2018 12:56:47 +0000 Subject: [PATCH] Revert "Roll chromium_revision 6fcad09d4a..004f3b4b40 (535596:535645) + sysroot fix" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c9e6a592265dd45a02dcf7b34144733f1a886370. Reason for revert: arm sysroot not being downloaded for linux arm32 build Original change's description: > Roll chromium_revision 6fcad09d4a..004f3b4b40 (535596:535645) + sysroot fix > > Adapt DEPS hooks after the change to install-sysroot.py, the same way it's done in > https://chromium.googlesource.com/chromium/src/+/a07b9feb203a4f0e1465adbfcd1e9883728b9c8b > > Change log: https://chromium.googlesource.com/chromium/src/+log/6fcad09d4a..004f3b4b40 > Full diff: https://chromium.googlesource.com/chromium/src/+/6fcad09d4a..004f3b4b40 > > Changed dependencies: > * src/base: https://chromium.googlesource.com/chromium/src/base/+log/83ec53d6ec..782ae7073a > * src/build: https://chromium.googlesource.com/chromium/src/build/+log/03220ef360..c1972dd397 > * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/7d3f4563c0..81576293e6 > * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/efea12dde9..e3de125b3f > * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/ffaf09e5ff..54f1b52f74 > DEPS diff: https://chromium.googlesource.com/chromium/src/+/6fcad09d4a..004f3b4b40/DEPS > > No update to Clang. > > BUG=None > CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal > > No-Try: True > Change-Id: I8026ac29cf127b863a2d60a36fdcdc7e6311aa45 > Reviewed-on: https://webrtc-review.googlesource.com/50183 > Commit-Queue: Oleh Prypin > Reviewed-by: Patrik Höglund > Cr-Commit-Position: refs/heads/master@{#21968} TBR=phoglund@webrtc.org,oprypin@webrtc.org Change-Id: I7bd3ce6b93e4c5f1e4884dc2bfb5e8b54bac2876 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: None Cq-Include-Trybots: master.internal.tryserver.corp.webrtc:linux_internal Reviewed-on: https://webrtc-review.googlesource.com/50340 Reviewed-by: Oleh Prypin Commit-Queue: Oleh Prypin Cr-Commit-Position: refs/heads/master@{#21969} --- DEPS | 51 +++++++++++++-------------------------------------- 1 file changed, 13 insertions(+), 38 deletions(-) diff --git a/DEPS b/DEPS index 15c1665583..03eef4584b 100644 --- a/DEPS +++ b/DEPS @@ -7,7 +7,7 @@ vars = { 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', 'webrtc_git': 'https://webrtc.googlesource.com', - 'chromium_revision': '004f3b4b4000be325307d1c409a03411aa00beaa', + 'chromium_revision': '6fcad09d4a17b65c16ac2c0b71b3b0b29132935f', 'boringssl_git': 'https://boringssl.googlesource.com', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client @@ -38,9 +38,9 @@ deps = { # TODO(kjellander): Move this to be Android-only once the libevent dependency # in base/third_party/libevent is solved. 'src/base': - Var('chromium_git') + '/chromium/src/base' + '@' + '782ae7073af5eb7f92761761f365509e1cb05771', + Var('chromium_git') + '/chromium/src/base' + '@' + '83ec53d6ecad2ed3054464fc8a3ef32007b7e8a1', 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + 'c1972dd3978f1de4da537c7c5ef24a39a71f67c5', + Var('chromium_git') + '/chromium/src/build' + '@' + '03220ef3604673e3b9a14e8770933123bde6c009', 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + '2637e7e911524502ea862870f52c36ed2723a25f', # Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC. @@ -54,9 +54,9 @@ deps = { 'condition': 'checkout_ios', }, 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + '81576293e60c168fc2e7f4c719bedd614144e766', + Var('chromium_git') + '/chromium/src/testing' + '@' + '7d3f4563c0870ba5a19e21e81d03ea5592ff9998', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + 'e3de125b3f7a79004fa2d641870629f9272343d8', + Var('chromium_git') + '/chromium/src/third_party' + '@' + 'efea12dde96f2d66a9b25b70b169b39110c5f2d7', 'src/third_party/android_ndk': { 'url': Var('chromium_git') + '/android_ndk.git' + '@' + 'e951c37287c7d8cd915bf8d4149fd4a06d808b55', 'condition': 'checkout_android', @@ -159,7 +159,7 @@ deps = { 'src/third_party/yasm/source/patched-yasm': Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc', 'src/tools': - Var('chromium_git') + '/chromium/src/tools' + '@' + '54f1b52f749a2b2f06080b9d4d57b41c2fe8d497', + Var('chromium_git') + '/chromium/src/tools' + '@' + 'ffaf09e5ff6e933e382e1c291d3ec9f01202b2fa', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb', 'src/tools/swarming_client': @@ -193,41 +193,16 @@ hooks = [ '--disable', ], }, - # Downloads the current stable linux sysroot to build/linux/ if needed. { - 'name': 'sysroot_arm', + # Downloads the current stable linux sysroot to build/linux/ if needed. + # This sysroot updates at about the same rate that the chrome build deps + # change. This script is a no-op except for linux users who are doing + # official chrome builds or cross compiling. + 'name': 'sysroot', 'pattern': '.', - 'condition': 'checkout_linux and checkout_arm', + 'condition': 'checkout_linux', 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py', - '--arch=arm'], - }, - { - 'name': 'sysroot_arm64', - 'pattern': '.', - 'condition': 'checkout_linux and checkout_arm64', - 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py', - '--arch=arm64'], - }, - { - 'name': 'sysroot_x86', - 'pattern': '.', - 'condition': 'checkout_linux and (checkout_x86 or checkout_x64)', - 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py', - '--arch=x86'], - }, - { - 'name': 'sysroot_mips', - 'pattern': '.', - 'condition': 'checkout_linux and checkout_mips', - 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py', - '--arch=mips'], - }, - { - 'name': 'sysroot_x64', - 'pattern': '.', - 'condition': 'checkout_linux and checkout_x64', - 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py', - '--arch=x64'], + '--running-as-hook'], }, { # Update the Windows toolchain if necessary. Must run before 'clang' below.