diff --git a/DEPS b/DEPS index 4b86f91..b614df8 100644 --- a/DEPS +++ b/DEPS
@@ -43,6 +43,8 @@ 'checkout_nacl', 'checkout_oculus_sdk', 'checkout_openxr', + 'cros_boards', + 'cros_boards_with_qemu_images', 'mac_xcode_version', ] @@ -154,11 +156,14 @@ # Default to the empty board. Desktop Chrome OS builds don't need cros SDK # dependencies. Other Chrome OS builds should always define this explicitly. - 'cros_boards': '', + 'cros_boards': Str(''), + 'cros_boards_with_qemu_images': Str(''), # Building for CrOS is only supported on linux currently. 'checkout_simplechrome': '(checkout_chromeos and host_os == "linux") and ("{cros_boards}" != "")', # Surround the board var in quotes so gclient doesn't try parsing the string # as an expression. + # TODO(crbug.com/937821): Replace uses of this var with + # 'cros_boards_with_qemu_images' above. 'cros_download_vm': '(("{cros_boards}" == "amd64-generic") or ("{cros_boards}" == "betty")) or ("{cros_boards}" == "betty-pi-arc")', # Should we build and test for public (ie: full) CrOS images, or private # (ie: release) images. @@ -194,7 +199,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and whatever else without interference from each other. - 'skia_revision': '7fe0359130f9ede30e1bcf4befc23ec352d48f42', + 'skia_revision': 'd72cb4c076b7113b667a706ddecb8f03695ca555', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. @@ -206,7 +211,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ANGLE # and whatever else without interference from each other. - 'angle_revision': '82359f926f81b3ffd795d65799295dfc7b7adc4d', + 'angle_revision': '45f54928a6280936f6a2f60aa7a413fb68292604', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling SwiftShader # and whatever else without interference from each other. @@ -257,7 +262,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': '71892ba52d17e5a441c60b9a546764cb29165276', + 'catapult_revision': '19856e664354b32ed421601e7723480c3b51c8cd', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -317,7 +322,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'dawn_revision': 'c15c6eb9d8c37754c189d72b0f4add60cc499bd8', + 'dawn_revision': 'e8e089ad282e27d21c7bb426a73819d67266a3b3', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. @@ -356,7 +361,7 @@ 'ukey2_revision': '0275885d8e6038c39b8a8ca55e75d1d4d1727f47', # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'tint_revision': '919011af0a2ae1b663aae0aaa4083a3f9f13e66d', + 'tint_revision': '5f43fedcddba8fd4cc3d9ff21b2ae8c5f8f4f4bc', # TODO(crbug.com/941824): The values below need to be kept in sync # between //DEPS and //buildtools/DEPS, so if you're updating one, @@ -894,7 +899,7 @@ }, 'src/third_party/depot_tools': - Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '78a6bf63710df0fefc27b268bc63a03ac37d9220', + Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '233589f2e73f9cc1e4c759d93ab0565efc81ad36', 'src/third_party/devtools-frontend/src': Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'), @@ -1247,7 +1252,7 @@ }, 'src/third_party/perfetto': - Var('android_git') + '/platform/external/perfetto.git' + '@' + 'cab02df7a5c58d33c19afef6a84194b65f0aa826', + Var('android_git') + '/platform/external/perfetto.git' + '@' + 'df50009d3edec39cee9a7f5a59851701848fa32d', 'src/third_party/perl': { 'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3', @@ -1325,7 +1330,7 @@ 'packages': [ { 'package': 'fuchsia/third_party/aemu/linux-amd64', - 'version': '2mJq_oWu-q0HyRGke_W6FjEJNmcrTYhhhN1jjxIg9_4C' + 'version': 'qH1GinMX67CP0YPwoB1xzpQVlBVVjqbDaNokFsY7Ax8C' }, ], 'condition': 'host_os == "linux" and checkout_fuchsia', @@ -1475,7 +1480,7 @@ }, 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + '820021d24600b8628b8644c43fddf67fa37ccf84', + Var('webrtc_git') + '/src.git' + '@' + '0c5f244817c22303d65811e6a25b3d97f8a08127', 'src/third_party/libgifcodec': Var('skia_git') + '/libgifcodec' + '@'+ Var('libgifcodec_revision'), @@ -1513,7 +1518,7 @@ 'packages': [ { 'package': 'skia/tools/goldctl/linux-amd64', - 'version': 'git_revision:03ea4eb574acd232e223a6b13d15ebfb61f1c0d8', + 'version': 'git_revision:98b51cb50bea650bac90ab1001ea509dcb6eac2f', }, ], 'dep_type': 'cipd', @@ -1523,7 +1528,7 @@ 'packages': [ { 'package': 'skia/tools/goldctl/windows-amd64', - 'version': 'git_revision:03ea4eb574acd232e223a6b13d15ebfb61f1c0d8', + 'version': 'git_revision:98b51cb50bea650bac90ab1001ea509dcb6eac2f', }, ], 'dep_type': 'cipd', @@ -1533,7 +1538,7 @@ 'packages': [ { 'package': 'skia/tools/goldctl/mac-amd64', - 'version': 'git_revision:03ea4eb574acd232e223a6b13d15ebfb61f1c0d8', + 'version': 'git_revision:98b51cb50bea650bac90ab1001ea509dcb6eac2f', }, ], 'dep_type': 'cipd',