Add reclient and siso dependencies

Bug: angleproject:8309
Change-Id: I4bac3f500b58b8881131c0f3679813e5adca09bc
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4683452
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

.gitignore

@@ -1,6 +1,13 @@
 .DS_Store
+.cipd
+.gclient*
+.git_cl_description_backup
+.idea/
 .vs
 .vscode
+.reproxy_cache
+.sw*
+.*.sw*
 *.Makefile
 *.ncb
 *.nvuser
@@ -22,11 +29,6 @@
 *.vcxproj.user
 *.vsp
 *~
-.*.sw*
-.sw*
-.cipd
-.gclient*
-.git_cl_description_backup
 /src/tests/third_party/gles_conformance_tests
 /testing
 /third_party/abseil-cpp
@@ -73,6 +75,7 @@
 /third_party/proguard/lib
 /third_party/protobuf
 /third_party/Python-Markdown
+/third_party/siso
 /third_party/qemu-linux-x64
 /third_party/qemu-mac-x64
 /third_party/r8/d8
@@ -125,7 +128,6 @@ Release_ARM/
 Release_Win32/
 Release_x64/
 TestResults.qpa
-.idea/
 
 # Any temporary files will confuse code generation.
 !scripts/code_generation_hashes/*

DEPS

@@ -138,6 +138,21 @@ vars = {
   # https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja
   'ninja_version': 'version:2@1.11.1.chromium.6',
 
+  # Fetch configuration files required for the 'use_remoteexec' gn arg
+  'download_remoteexec_cfg': False,
+  # RBE instance to use for running remote builds
+  'rbe_instance': Str('projects/rbe-chrome-untrusted/instances/default_instance'),
+  # RBE project to download rewrapper config files for. Only needed if
+  # different from the project used in 'rbe_instance'
+  'rewrapper_cfg_project': Str(''),
+  # reclient CIPD package
+  'reclient_package': 'infra/rbe/client/',
+  # reclient CIPD package version
+  'reclient_version': 're_client_version:0.112.0.ffc95d4-gomaip',
+
+  # siso CIPD package version.
+  'siso_version': 'git_revision:c349fcb5f693249d938e2d4ce4c4b4d037dceb5b',
+
   # 'magic' text to tell depot_tools that git submodules should be accepted but
   # but parity with DEPS file is expected.
   'SUBMODULE_MIGRATION': 'True'
@@ -182,6 +197,17 @@ deps = {
     'condition': 'not build_with_chromium and host_os == "mac"',
   },
 
+  'buildtools/reclient': {
+    'packages': [
+      {
+        'package': Var('reclient_package') + '${{platform}}',
+        'version': Var('reclient_version'),
+      }
+    ],
+    'dep_type': 'cipd',
+    'condition': 'not build_with_chromium',
+  },
+
   'buildtools/win': {
     'packages': [
       {
@@ -608,6 +634,17 @@ deps = {
     'condition': 'checkout_android and not build_with_chromium',
   },
 
+  'third_party/siso': {
+    'packages': [
+      {
+        'package': 'infra/build/siso/${{platform}}',
+        'version': Var('siso_version'),
+      }
+    ],
+    'dep_type': 'cipd',
+    'condition': 'not build_with_chromium',
+  },
+
   'third_party/six': {
     'url': '{chromium_git}/chromium/src/third_party/six@32c68ae5c1fa363e3e86d56a59d230c445f018ac',
     'condition': 'checkout_android and not build_with_chromium',
@@ -5214,7 +5251,35 @@ hooks = [
     'pattern': '.',
     'condition': 'checkout_angle_mesa',
     'action': [ 'python3', 'third_party/mesa/mesa_build.py', 'runhook', ],
-  }
+  },
+
+  # Configure remote exec cfg files
+  {
+    'name': 'configure_reclient_cfgs',
+    'pattern': '.',
+    'condition': 'download_remoteexec_cfg and not build_with_chromium',
+    'action': ['python3',
+               'buildtools/reclient_cfgs/configure_reclient_cfgs.py',
+               '--rbe_instance',
+               Var('rbe_instance'),
+               '--reproxy_cfg_template',
+               'reproxy.cfg.template',
+               '--rewrapper_cfg_project',
+               Var('rewrapper_cfg_project'),
+               '--quiet',
+               ],
+  },
+  # Configure Siso for developer builds.
+  {
+    'name': 'configure_siso',
+    'pattern': '.',
+    'condition': 'not build_with_chromium',
+    'action': ['python3',
+               'build/config/siso/configure_siso.py',
+               '--rbe_instance',
+               Var('rbe_instance'),
+               ],
+  },
 ]
 
 recursedeps = [

scripts/roll_chromium_deps.py

@@ -34,6 +34,7 @@ ANGLE_CHROMIUM_DEPS = [
     'buildtools',
     'buildtools/linux64',
     'buildtools/mac',
+    'buildtools/reclient',
     'buildtools/win',
     'testing',
     'third_party/abseil-cpp',
@@ -77,6 +78,7 @@ ANGLE_CHROMIUM_DEPS = [
     'third_party/r8',
     'third_party/r8/d8',
     'third_party/requests/src',
+    'third_party/siso',
     'third_party/six',
     'third_party/turbine',
     'third_party/zlib',