diff --git a/DEPS b/DEPS index 169cad33..5bd8438e4 100644 --- a/DEPS +++ b/DEPS
@@ -96,9 +96,9 @@ # be overridden by gclient variables. 'checkout_google_benchmark': False, - # Check out and download nacl by default. This can be disabled e.g. with - # custom_vars. - 'checkout_nacl': True, + # Check out and download nacl by default, unless on an arm mac. + # This can be disabled e.g. with custom_vars. + 'checkout_nacl': 'not (host_os == "mac" and host_cpu == "arm64")', # By default, do not check out src-internal. This can be overridden e.g. with # custom_vars. @@ -180,7 +180,7 @@ # luci-go CIPD package version. # Make sure the revision is uploaded by infra-packagers builder. # https://ci.chromium.org/p/infra-internal/g/infra-packagers/console - 'luci_go': 'git_revision:e567b4580a0854199f30444e583c17ee65abcc10', + 'luci_go': 'git_revision:e1c81c53ccd0366e8fff438f89030043343d4d6b', # This can be overridden, e.g. with custom_vars, to build clang from HEAD # instead of downloading the prebuilt pinned revision. @@ -209,11 +209,11 @@ # 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': '441c1bc315ff42d7eee2e24e11bdc1529651bfe4', + 'skia_revision': 'c028c5c1f83eefb30802e63b5aebbc1b01f2012b', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'v8_revision': '80554cb686d937860b92a8d76f30385d50f7ac37', + 'v8_revision': '51d2f5d446066975c5c4dd195fa91d6d9a197ffa', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client # and whatever else without interference from each other. @@ -221,22 +221,22 @@ # 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': '7fe44a53d74e1837bf43334384b0c3335226a89e', + 'angle_revision': '12bdb7f01d55266c2c68e5204313442ce51ff718', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling SwiftShader # and whatever else without interference from each other. - 'swiftshader_revision': 'a98fb3f8380a3a5c9ae3e0175634ba88c85a434f', + 'swiftshader_revision': '8969f861fc24e2e630df46e2e9a625abfbe00e57', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling PDFium # and whatever else without interference from each other. - 'pdfium_revision': '58700ed0fd5338cb778d7c3e675ba6334c8b9862', + 'pdfium_revision': '6fc2c31115fcb9cf8a2c25d228c03fcd0ef16a2f', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling BoringSSL # and whatever else without interference from each other. # # Note this revision should be updated with # third_party/boringssl/roll_boringssl.py, not roll-dep. - 'boringssl_revision': 'dfe0b01b3eb3773d16a099cb1f900f9ca48fc842', + 'boringssl_revision': '49f0329110a1d93a5febc2bceceedc655d995420', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling google-toolbox-for-mac # and whatever else without interference from each other. @@ -244,7 +244,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling googletest # and whatever else without interference from each other. - 'googletest_revision': '07f4869221012b16b7f9ee685d94856e1fc9f361', + 'googletest_revision': '1a8ecf1813d022cc7914e04564b92decff6161fc', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling lighttpd # and whatever else without interference from each other. @@ -264,7 +264,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling freetype # and whatever else without interference from each other. - 'freetype_testing_revision': '8b42ad59ca2cabc88f572d8cd4f24e28d5485520', + 'freetype_testing_revision': '2ee7aa2995746b29e06354ac32a30ae78fef70bb', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling HarfBuzz # and whatever else without interference from each other. @@ -280,7 +280,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': '999f35f30e7ed72d640fea1b86f74d54a41896ed', + 'catapult_revision': '36e45025a81ac877509a444ce80a04f57544f50b', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -288,7 +288,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling devtools-frontend # and whatever else without interference from each other. - 'devtools_frontend_revision': '1d7474a9d91f0d9205c7270dca2a7f8d63cc9267', + 'devtools_frontend_revision': '543c28e9b344ea2eee940e67ce707be0de1a8c07', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libprotobuf-mutator # and whatever else without interference from each other. @@ -328,7 +328,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': '5e121c935033f26aece2590ff4710dbf36e77bdd', + 'dawn_revision': '6d0438c21e0fd5f47a2eaac5183bef765f4b4a05', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. @@ -352,7 +352,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libavif # and whatever else without interference from each other. - 'libavif_revision': '4fedf0bb08229767d75ebe7d00b272e131aaa578', + 'libavif_revision': '365bd5e1c2a2304801a8866835fd4b3294f39f10', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling nearby # and whatever else without interference from each other. @@ -368,15 +368,15 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'tint_revision': '4daddd1759c6d061dd0c8d0043d41f8c1717a82b', + 'tint_revision': '5c9906e3079f81dde27dffb05109279afedc11dc', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'resultdb_version': 'git_revision:b7e2ebc4a66838d4a66cd18a141360b5909bdf19', + 'resultdb_version': 'git_revision:65b41c1a56b49e7b33de8efb9d8fc993ff03851c', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'libcxxabi_revision': '4e078437d00810ef55f668244049c5ff937bc4bb', + 'libcxxabi_revision': 'f50df92a297982cc7468fb614b284bb31aa08e60', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. @@ -566,7 +566,7 @@ }, 'src/ios/third_party/material_components_ios/src': { - 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '08d42c18d8ae1991e25c97ebf456c0acb4fa292a', + 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '84b83bdb8bf34172214876305a9fcc9ae5436b47', 'condition': 'checkout_ios', }, @@ -701,7 +701,7 @@ 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': 'c1XqVP7XC51iTS4Zs03SWVTsz5AdCYHK01o4IsyEC0MC', + 'version': 'w9GAjqe9yb27SB37J97HO2Csomsj30SOyHZrDvgbbP0C', }, ], 'condition': 'checkout_android', @@ -914,7 +914,7 @@ # Tools used when building Chrome for Chrome OS. This affects both the Simple # Chrome workflow, as well as the chromeos-chrome ebuild. 'src/third_party/chromite': { - 'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '039b518d2341ad8c732ecb27356f685e66786079', + 'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '6611b445156c7b36ab55d6388da1c9ad2a91a7f1', 'condition': 'checkout_chromeos', }, @@ -929,7 +929,7 @@ # For Linux and Chromium OS. 'src/third_party/cros_system_api': { - 'url': Var('chromium_git') + '/chromiumos/platform2/system_api.git' + '@' + 'def15a8f1276d81b13e6b55a26d8cf5e2fda443f', + 'url': Var('chromium_git') + '/chromiumos/platform2/system_api.git' + '@' + 'd54a87ce2e17c76fe04797b06bb5cfe6f9d11852', 'condition': 'checkout_linux', }, @@ -1289,7 +1289,7 @@ Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + '3dd5b80bc4f172dd82925bb259cb7c82348409c5', 'src/third_party/openscreen/src': - Var('chromium_git') + '/openscreen' + '@' + '9a74573f1754f353316fd75359191fabb9945df6', + Var('chromium_git') + '/openscreen' + '@' + 'f839787a7d1d9a0b510d4fbe29dc241edca8fe68', 'src/third_party/openxr/src': { 'url': Var('chromium_git') + '/external/github.com/KhronosGroup/OpenXR-SDK' + '@' + '97cfe495bb7a3853266b646d1c79e169387f9c7a', @@ -1306,7 +1306,7 @@ }, 'src/third_party/perfetto': - Var('android_git') + '/platform/external/perfetto.git' + '@' + '0c5063732065602808af64fc61282cbcf06c6e37', + Var('android_git') + '/platform/external/perfetto.git' + '@' + '5c32bc92b27666942869e222783eed71b08147fb', 'src/third_party/perl': { 'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3', @@ -1384,7 +1384,7 @@ 'packages': [ { 'package': 'fuchsia/third_party/aemu/linux-amd64', - 'version': '2syboMD578Ydl4RbpuwsjwHAq9bllc8WS3Sbz0HOUs8C' + 'version': 'yUG1ytWkDK27ghNyN8PxiqHN7NZJ5hmgalY_y9X9ZtIC' }, ], 'condition': 'host_os == "linux" and checkout_fuchsia', @@ -1467,7 +1467,7 @@ Var('chromium_git') + '/external/github.com/google/snappy.git' + '@' + 'ea368c2f07de5f31146a10214f27d15091b09771', 'src/third_party/sqlite/src': - Var('chromium_git') + '/chromium/deps/sqlite.git' + '@' + '60efbb3584af2ba05e1935b3e07d3a861841db7c', + Var('chromium_git') + '/chromium/deps/sqlite.git' + '@' + '45174b3e6cb1449dcb82d0111f9a749529b47141', 'src/third_party/sqlite4java': { 'packages': [ @@ -1513,7 +1513,7 @@ }, 'src/third_party/usrsctp/usrsctplib': - Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '991335be3de503ef02cd9f8415e4242ad3f107f9', + Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '79f0178cd3cf327cc8721cee15609269964ef81a', 'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@105af117f0532953577198cc9bd8ee6f76c29009', @@ -1536,13 +1536,13 @@ Var('chromium_git') + '/external/github.com/SeleniumHQ/selenium/py.git' + '@' + 'd0045ec570c1a77612db35d1e92f05e1d27b4d53', 'src/third_party/webgl/src': - Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '495f5c1a7d3dfe31b010db2c8093b1dbaecef8ff', + Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + 'aea189a7373c5c0fc93b14c9b8ffe9c0369a8a0e', 'src/third_party/webgpu-cts/src': Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '24074a989202ff1cb17659450b5b757c6f8d991c', 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + 'c73257651b221585798dc46ec539f94f332500b6', + Var('webrtc_git') + '/src.git' + '@' + '2072b87261a6505a88561bdeab3e7405d7038eaa', 'src/third_party/libgifcodec': Var('skia_git') + '/libgifcodec' + '@'+ Var('libgifcodec_revision'), @@ -1580,7 +1580,7 @@ 'packages': [ { 'package': 'skia/tools/goldctl/linux-amd64', - 'version': 'PFAC9ipfkYe6ZljRb8758leyPy7Jw6Dhl2dtHp0IsMYC', + 'version': 'siMs1o8b-ON1wWPwvSA4NKhGMBXPWhkMQ3HHr7-yDqQC', }, ], 'dep_type': 'cipd', @@ -1590,7 +1590,7 @@ 'packages': [ { 'package': 'skia/tools/goldctl/windows-amd64', - 'version': '3Z3zEAwtATXaw6OCunrkLRtBDiMoKW34b_yeMZ82eocC', + 'version': 'rLRz9NhcZkVWiGMr_kp9C1L_1QOynKyxdh-eu6REt4MC', }, ], 'dep_type': 'cipd', @@ -1600,7 +1600,7 @@ 'packages': [ { 'package': 'skia/tools/goldctl/mac-amd64', - 'version': 'Ht0L_bool7JJxm1K8Y4MzgKRlPhoIYiVaHruwzqROMEC', + 'version': '77UQ9Zx-irz8MxBwN3CtYielGQtPthCIaWzlOONC8_MC', }, ], 'dep_type': 'cipd', @@ -1614,7 +1614,7 @@ Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'), 'src-internal': { - 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@2e6b3dd99af76a9ac8993b5752c6d1155473f938', + 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@aa3c8f682497460c1d0e2ec20e24689d75532216', 'condition': 'checkout_src_internal', }, @@ -1633,7 +1633,7 @@ 'packages': [ { 'package': 'chromeos_internal/apps/help_app/app', - 'version': 'uRbydH8iyNJLLlt9ormsr-PM_INMdDK_BeEXMk-CTTMC', + 'version': 'e2GbuDP2W_jMIh2gkk9xehjtuY__ToqnGBe5rFOyC1IC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -1644,7 +1644,7 @@ 'packages': [ { 'package': 'chromeos_internal/apps/media_app/app', - 'version': 'rJAcS985AkjmQWWWuQNjOp4Bsps5CzqmxH4L9n0ouOUC', + 'version': '27z5U51S6x4iCxcmV0biBHiT8muCOYnOvPjjwVLFxz0C', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -3658,7 +3658,7 @@ # Update the Mac toolchain if necessary. 'name': 'mac_toolchain', 'pattern': '.', - 'condition': 'checkout_mac', + 'condition': 'checkout_mac or checkout_ios', 'action': ['python', 'src/build/mac_toolchain.py'], }, { @@ -3930,7 +3930,7 @@ { 'name': 'node_mac', 'pattern': '.', - 'condition': 'host_os == "mac"', + 'condition': 'host_os == "mac" and host_cpu == "x64"', 'action': [ 'python', 'src/third_party/depot_tools/download_from_google_storage.py', '--no_resume', @@ -3941,6 +3941,22 @@ ], }, { + # TODO: Node 16.0 will likely ship with an official universal node binary + # on macOS. Once node 16.0 is released, collapse this into the node_mac hook + # above again and use the universal binary on mac independent of host_cpu. + 'name': 'node_mac_arm64', + 'pattern': '.', + 'condition': 'host_os == "mac" and host_cpu == "arm64"', + 'action': [ 'python', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--extract', + '--no_auth', + '--bucket', 'chromium-nodejs/16.0.0-pre', + '-s', 'src/third_party/node/mac/node-darwin-arm64.tar.gz.sha1', + ], + }, + { 'name': 'node_win', 'pattern': '.', 'condition': 'host_os == "win"', @@ -4371,6 +4387,17 @@ ], }, + { + 'name': 'Generate component metadata for tests', + 'pattern': '.', + 'action': [ + 'vpython', + 'src/testing/generate_location_tags.py', + '--out', + 'src/testing/location_tags.json', + ], + }, + # Download and initialize "vpython" VirtualEnv environment packages. { 'name': 'vpython_common',