diff --git a/DEPS b/DEPS index dea070f..24b2bd27 100644 --- a/DEPS +++ b/DEPS
@@ -102,9 +102,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_board': '', + # Building for CrOS is only supported on linux currently. + 'checkout_simplechrome': '(checkout_chromeos and host_os == "linux") and ("{cros_board}" != "")', # Surround the board var in quotes so gclient doesn't try parsing the string # as an expression. 'cros_download_vm': '"{cros_board}" == "amd64-generic"', + # Should we build and test for public (ie: full) CrOS images, or private + # (ie: release) images. + 'use_public_cros_config': 'not checkout_src_internal', # ANGLE's deps are relative to the angle_root variable. 'angle_root': 'src/third_party/angle', @@ -133,11 +138,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': 'e700738f3c8f3eebb613eb0cb7312a13468a13bf', + 'skia_revision': 'c19999801df0ca538e8576b353177e76b6892512', # 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': '2de3cf380f29310984f58671153d98c4066adb0f', + 'v8_revision': 'a839a8787787b39289c5d496e15d3514a1ac5e43', # 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. @@ -145,7 +150,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': 'b86e73daf7db3f0b7ee08a49829a96a7217f71c0', + 'angle_revision': 'fb8e1b25ad7165591b9df6a1190316610bd6476b', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling SwiftShader # and whatever else without interference from each other. @@ -168,7 +173,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': '9d4cde44a4a3952cf21861f9370b3bed9265dfd7', + 'googletest_revision': 'f71fb4f9a912ec945401cc49a287a759b6131026', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling lighttpd # and whatever else without interference from each other. @@ -196,7 +201,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': 'ea6b999d4bba12c46fb69a6b4ddd448cc238213e', + 'catapult_revision': '535dc1d8e2b7372951dfeb8e57f592bf0c823870', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -802,7 +807,7 @@ # Build tools for Chrome OS. Note: This depends on third_party/pyelftools. 'src/third_party/chromite': { - 'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '21b95024e051a0a0224739b7dcc9268c84b3eadd', + 'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '4a0f5098c4db35c9b4be1fbbf356c37e8e4c296f', 'condition': 'checkout_linux', }, @@ -827,7 +832,7 @@ }, 'src/third_party/depot_tools': - Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'd6bf517dd4f5e899d79b865e671353b4ce616f6e', + Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'aca5b6aca87dd7872c457ae6589902876556c854', 'src/third_party/devtools-node-modules': Var('chromium_git') + '/external/github.com/ChromeDevTools/devtools-node-modules' + '@' + Var('devtools_node_modules_revision'), @@ -1177,7 +1182,7 @@ }, 'src/third_party/perfetto': - Var('android_git') + '/platform/external/perfetto.git' + '@' + '945361d2c8963b58a27c2a81ce18ae5cf9d909b7', + Var('android_git') + '/platform/external/perfetto.git' + '@' + '1ef91c971fde3aa0ee292c425e8e8324a9f29228', 'src/third_party/perl': { 'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + 'ac0d98b5cee6c024b0cffeb4f8f45b6fc5ccdb78', @@ -1345,7 +1350,7 @@ Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '6f0b34abee8dba611c253738d955c59f703c147a', 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + 'd703cd022f64ddb6225b08719c2e40d1e1aa997a', + Var('webrtc_git') + '/src.git' + '@' + '9c91887c3f47b037a412f045bee1fbf0302dd4ae', 'src/third_party/xdg-utils': { 'url': Var('chromium_git') + '/chromium/deps/xdg-utils.git' + '@' + 'd80274d5869b17b8c9067a1022e4416ee7ed5e0d', @@ -1386,7 +1391,7 @@ Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'), 'src-internal': { - 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@8b6de23af332aa73e5e921fbedf2f4ac8be0512d', + 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@56355ce2d52f4caabe893932ee3970ef0fb03ffe', 'condition': 'checkout_src_internal', }, @@ -2900,13 +2905,13 @@ ], }, - # Download CrOS simplechrome artifacts. The first hooks is for boards that - # support VM images, the second hook for all other boards. + # Download public CrOS simplechrome artifacts. The first hooks is for boards + # that support VM images, the second hook for all other boards. For internal + # boards, see src-internal's DEPS. { 'name': 'cros_simplechrome_artifacts_with_vm', 'pattern': '.', - # Building for CrOS is only supported on linux currently. - 'condition': '((checkout_chromeos and host_os == "linux") and cros_download_vm) and ("{cros_board}" != "")', + 'condition': '(checkout_simplechrome and cros_download_vm) and use_public_cros_config', 'action': [ 'src/third_party/chromite/bin/cros', 'chrome-sdk', @@ -2927,8 +2932,7 @@ { 'name': 'cros_simplechrome_artifacts_with_no_vm', 'pattern': '.', - # Building for CrOS is only supported on linux currently. - 'condition': '((checkout_chromeos and host_os == "linux") and not cros_download_vm) and ("{cros_board}" != "")', + 'condition': '(checkout_simplechrome and not cros_download_vm) and use_public_cros_config', 'action': [ 'src/third_party/chromite/bin/cros', 'chrome-sdk',