From ea86cfd2e3a3df176d31835799356ea36a71c13a Mon Sep 17 00:00:00 2001 From: Yuly Novikov Date: Tue, 12 Apr 2022 09:06:17 -0400 Subject: [PATCH] Roll chromium_revision f89964bd5b..f961a0d473 (990903:991486) Switch Pixel 6 from Android 12 (S) to Android 13 (T). Change log: https://chromium.googlesource.com/chromium/src/+log/f89964bd5b..f961a0d473 Full diff: https://chromium.googlesource.com/chromium/src/+/f89964bd5b..f961a0d473 Changed dependencies * build: https://chromium.googlesource.com/chromium/src/build.git/+log/2c3758a417..8ad9c1c830 * testing: https://chromium.googlesource.com/chromium/src/testing/+log/75cd8f7f15..936a348f0a * third_party/android_ndk: https://chromium.googlesource.com/android_ndk.git/+log/9644104c8c..8388a2be54 * third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/{catapult_..0e3c38595b * third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/e222245128..3b97fa826e * third_party/turbine: CJm6IViplElcjFYLJc0XtAjZ97BOVjQIwigcJN6C9gsC..y4x80kUnDOxC5QyG48MlVoiRIEn09eaHcIJQFavlqgMC * third_party/zlib: https://chromium.googlesource.com/chromium/src/third_party/zlib/+log/c61f267866..a6d209ab93 * tools/clang: https://chromium.googlesource.com/chromium/src/tools/clang.git/+log/3eacd6cee1..b5e2f7c16b * tools/mb: https://chromium.googlesource.com/chromium/src/tools/mb/+log/6de0b20e70..78263e3102 * tools/perf: https://chromium.googlesource.com/chromium/src/tools/perf/+log/6abc0266d4..b92a448a92 DEPS diff: https://chromium.googlesource.com/chromium/src/+/f89964bd5b..f961a0d473/DEPS No update to Clang. Bug: angleproject:6819 Change-Id: I93514068385887ad2bfc63184474fa9bc7a0d060 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3583150 Commit-Queue: Yuly Novikov Auto-Submit: Yuly Novikov Reviewed-by: Jamie Madill Commit-Queue: Jamie Madill --- DEPS | 22 +++++++++---------- infra/specs/angle.json | 20 ++++++++--------- infra/specs/mixins.pyl | 2 +- infra/specs/waterfalls.pyl | 2 +- .../Test_spec_JSON.json | 8 +++---- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/DEPS b/DEPS index 6e4baad8d..8a2a23218 100644 --- a/DEPS +++ b/DEPS @@ -34,7 +34,7 @@ vars = { 'checkout_android_native_support': 'checkout_android or checkout_chromeos', # Version of Chromium our Chromium-based DEPS are mirrored from. - 'chromium_revision': 'f89964bd5b42ef10501bdf748de5c2dc2bf47515', + 'chromium_revision': 'f961a0d4732bdee34e5cd87e2ba4510bad416231', # We never want to checkout chromium, # but need a dummy DEPS entry for the autoroller 'dummy_checkout_chromium': False, @@ -79,7 +79,7 @@ vars = { # 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': '4326c47b24f7e3c58010e97f31d176bf960c5182', + 'catapult_revision': '0e3c38595b34be77c5585d9176dd0a3285427225', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling luci-go @@ -119,7 +119,7 @@ vars = { deps = { 'build': { - 'url': '{chromium_git}/chromium/src/build.git@2c3758a417ccaba55f88e4f65a237e5db3a48211', + 'url': '{chromium_git}/chromium/src/build.git@8ad9c1c830cdedc3b5f81dc0bcba3ea02d005a8b', 'condition': 'not build_with_chromium', }, @@ -182,7 +182,7 @@ deps = { }, 'testing': { - 'url': '{chromium_git}/chromium/src/testing@75cd8f7f15d4b8f05d4b7f795396f30a71e21ec6', + 'url': '{chromium_git}/chromium/src/testing@936a348f0a8be18874f71eb9620ff33df876f3d1', 'condition': 'not build_with_chromium', }, @@ -235,7 +235,7 @@ deps = { }, 'third_party/android_ndk': { - 'url': '{chromium_git}/android_ndk.git@9644104c8cf85bf1bdce5b1c0691e9778572c3f8', + 'url': '{chromium_git}/android_ndk.git@8388a2be5421311dc75c5f937aae13d821a27f3d', 'condition': 'checkout_android and not build_with_chromium', }, @@ -332,7 +332,7 @@ deps = { }, 'third_party/depot_tools': { - 'url': '{chromium_git}/chromium/tools/depot_tools.git@e22224512840a3f8cc5b298952b55b941fdf5add', + 'url': '{chromium_git}/chromium/tools/depot_tools.git@3b97fa826eee4bd1978c4c049038b1e4f201e8f2', 'condition': 'not build_with_chromium', }, @@ -504,7 +504,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/turbine', - 'version': 'CJm6IViplElcjFYLJc0XtAjZ97BOVjQIwigcJN6C9gsC', + 'version': 'y4x80kUnDOxC5QyG48MlVoiRIEn09eaHcIJQFavlqgMC', }, ], 'condition': 'checkout_android and not build_with_chromium', @@ -531,7 +531,7 @@ deps = { }, 'third_party/zlib': { - 'url': '{chromium_git}/chromium/src/third_party/zlib@c61f2678661a78b3fd84ee5afe490da498a0fb47', + 'url': '{chromium_git}/chromium/src/third_party/zlib@a6d209ab932df0f1c9d5b7dc67cfa74e8a3272c0', 'condition': 'not build_with_chromium', }, @@ -541,7 +541,7 @@ deps = { }, 'tools/clang': { - 'url': '{chromium_git}/chromium/src/tools/clang.git@3eacd6cee13a8e9a86a74fcaa5532eeb3aec676c', + 'url': '{chromium_git}/chromium/src/tools/clang.git@b5e2f7c16bbf3aefc9354e8fbad3de0a543f2193', 'condition': 'not build_with_chromium', }, @@ -572,7 +572,7 @@ deps = { }, 'tools/mb': { - 'url': '{chromium_git}/chromium/src/tools/mb@6de0b20e70372ace2f5dca92948fe9312b825d01', + 'url': '{chromium_git}/chromium/src/tools/mb@78263e3102407fc0de4e8c0cadb0b6ed01054677', 'condition': 'not build_with_chromium', }, @@ -587,7 +587,7 @@ deps = { }, 'tools/perf': { - 'url': '{chromium_git}/chromium/src/tools/perf@6abc0266d4f3ad73e84c6ea6ac5a709411d11d08', + 'url': '{chromium_git}/chromium/src/tools/perf@b92a448a92fd98e4e8a2a8faeae4c0aed29d4b1a', 'condition': 'not build_with_chromium', }, diff --git a/infra/specs/angle.json b/infra/specs/angle.json index 49255b313..2e35e5211 100644 --- a/infra/specs/angle.json +++ b/infra/specs/angle.json @@ -627,7 +627,7 @@ "containment_type": "AUTO", "dimension_sets": [ { - "device_os": "S", + "device_os": "T", "device_os_type": "userdebug", "device_type": "oriole", "os": "Android", @@ -665,7 +665,7 @@ "containment_type": "AUTO", "dimension_sets": [ { - "device_os": "S", + "device_os": "T", "device_os_type": "userdebug", "device_type": "oriole", "os": "Android", @@ -703,7 +703,7 @@ "containment_type": "AUTO", "dimension_sets": [ { - "device_os": "S", + "device_os": "T", "device_os_type": "userdebug", "device_type": "oriole", "os": "Android", @@ -741,7 +741,7 @@ "containment_type": "AUTO", "dimension_sets": [ { - "device_os": "S", + "device_os": "T", "device_os_type": "userdebug", "device_type": "oriole", "os": "Android", @@ -779,7 +779,7 @@ "containment_type": "AUTO", "dimension_sets": [ { - "device_os": "S", + "device_os": "T", "device_os_type": "userdebug", "device_type": "oriole", "os": "Android", @@ -816,7 +816,7 @@ "containment_type": "AUTO", "dimension_sets": [ { - "device_os": "S", + "device_os": "T", "device_os_type": "userdebug", "device_type": "oriole", "os": "Android", @@ -854,7 +854,7 @@ "containment_type": "AUTO", "dimension_sets": [ { - "device_os": "S", + "device_os": "T", "device_os_type": "userdebug", "device_type": "oriole", "os": "Android", @@ -891,7 +891,7 @@ "containment_type": "AUTO", "dimension_sets": [ { - "device_os": "S", + "device_os": "T", "device_os_type": "userdebug", "device_type": "oriole", "os": "Android", @@ -930,7 +930,7 @@ "containment_type": "AUTO", "dimension_sets": [ { - "device_os": "S", + "device_os": "T", "device_os_type": "userdebug", "device_type": "oriole", "os": "Android", @@ -966,7 +966,7 @@ "containment_type": "AUTO", "dimension_sets": [ { - "device_os": "S", + "device_os": "T", "device_os_type": "userdebug", "device_type": "oriole", "os": "Android", diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index f65d4e8f2..37fe0e81a 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -14,7 +14,7 @@ # For more info see Chromium's mixins.pyl in testing/buildbot. { 'android_r': {'swarming': {'dimensions': {'device_os': 'R'}}}, - 'android_s': {'swarming': {'dimensions': {'device_os': 'S'}}}, + 'android_t': {'swarming': {'dimensions': {'device_os': 'T'}}}, 'angle_skia_gold_test': { '$mixin_append': { 'args': [ '--git-revision=${got_angle_revision}'], 'precommit_args': [ '--gerrit-issue=${patch_issue}', '--gerrit-patchset=${patch_set}', diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 70883118c..ea2c9583a 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -45,7 +45,7 @@ 'android-arm64-pixel6': { 'os_type': 'android', 'mixins': [ - 'android_s', + 'android_t', 'oriole', 'gpu-swarming-pool', 'limited_capacity_bot', diff --git a/scripts/code_generation_hashes/Test_spec_JSON.json b/scripts/code_generation_hashes/Test_spec_JSON.json index 6c96b0173..9896acd43 100644 --- a/scripts/code_generation_hashes/Test_spec_JSON.json +++ b/scripts/code_generation_hashes/Test_spec_JSON.json @@ -1,10 +1,10 @@ { "infra/specs/angle.json": - "f0c117e4b4e7bf7812bb83ef07be32b6", + "a0c670a8a4333030406d3774a2f932ca", "infra/specs/generate_test_spec_json.py": "be4569626aa91f8872664e2d9cef4ac2", "infra/specs/mixins.pyl": - "32ce6e3e07eb484f7a58dfd7dbfc118b", + "8c7dc91920d47e32954120391cfed304", "infra/specs/test_suite_exceptions.pyl": "723460da84a90884a9668c07a0893390", "infra/specs/test_suites.pyl": @@ -12,9 +12,9 @@ "infra/specs/variants.pyl": "8cfcaa99fa07ad2a2d5d14f220fd5037", "infra/specs/waterfalls.pyl": - "359a98487538cc9ae94eebd072524b7a", + "db329524ea9686da7b32544a26b13203", "testing/buildbot/generate_buildbot_json.py": "b00cff8aba6d321d560c09ed7d8cba03", "testing/buildbot/mixins.pyl": - "9fe07f6b7a8d1610c486d528848a28ee" + "1bcc53655d0ec2c08e5b98d2c6602e70" } \ No newline at end of file