commit b8a7d9d09f8c4b47043e09966e3bcd0856416f0d
author Mirko Bonadei <mbonadei@webrtc.org> Mon Feb 12 07:57:35 2018
committer Commit Bot <commit-bot@chromium.org> Mon Feb 12 08:37:00 2018
tree 091e65fca0e661293ea29d352797f7383b65f867
parent 4b9124e43294dafa2ab974c3ff36815e4f851d76

Updating usage of install-sysroot.py to stop relying on GYP_DEFINES.

The --running-as-hook flag has been removed in
https://chromium-review.googlesource.com/c/chromium/src/+/907673.

This CL mirrors the changes done in the Chromium src/DEPS file.

Bug: chromium:807986
Change-Id: Ib952eb0dbd8149e4f8bdfa2323cb8f23e1d63e0b
Reviewed-on: https://webrtc-review.googlesource.com/51760
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21979}

DEPS

diff --git a/DEPS b/DEPS
index 03eef45..6b36c1d 100644
--- a/DEPS
+++ b/DEPS
@@ -194,15 +194,42 @@
     ],
   },
   {
-    # 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',
+    'name': 'sysroot_arm',
     'pattern': '.',
-    'condition': 'checkout_linux',
+    'condition': 'checkout_linux and checkout_arm',
     'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
-               '--running-as-hook'],
+               '--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)',
+    # TODO(mbonadei): change to --arch=x86.
+    'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
+               '--arch=i386'],
+  },
+  {
+    'name': 'sysroot_mips',
+    'pattern': '.',
+    'condition': 'checkout_linux and checkout_mips',
+    # TODO(mbonadei): change to --arch=mips.
+    'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
+               '--arch=mipsel'],
+  },
+  {
+    'name': 'sysroot_x64',
+    'pattern': '.',
+    'condition': 'checkout_linux and checkout_x64',
+    # TODO(mbonadei): change to --arch=x64.
+    'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
+               '--arch=amd64'],
   },
   {
     # Update the Windows toolchain if necessary. Must run before 'clang' below.