Roll Chromium from d6f22a2a164b to 9e0b5e8b8a85 (1063 revisions)

Manually update third_party/flatbuffers from Chromium d6f22a2a16..9e0b5e8b8a If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/chromium-angle-autoroll Please CC angle-team@google.com,geofflang@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Chromium: https://bugs.chromium.org/p/chromium/issues/entry To file a bug in ANGLE: https://bugs.chromium.org/p/angleproject/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Changed dependencies * build: defeac7e7d..c884d70f0c * buildtools/third_party/libunwind/trunk: cd144ced35..b5a43ecdac * testing: 21f1443014..098d0a11e4 * third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/{catapult_..dc627ec37b * third_party/depot_tools: 9e0ff22bfb..0d627781be * third_party/flatbuffers/src: a56f9ec50e..13fc75cb6b * third_party/r8: 0LMjUUpzAmxHrlftkzbDAaeuTDNXrOEgTgyJm8qIyvMC..iTbMDX2gRMW4nmoA8J7oToRDDsMcjm6hJNVH-RpYKIoC * third_party/turbine: Foa7uRpVoKr4YoayCKc9EERkjpmGOE3DAUTWFLL7gKEC..G8Cku1fztaDd9to_8gk3PNWM2iRacAxD9zcUAgUPUEAC * third_party/zlib: 982b036a25..9c8e4fdccb * tools/android: 07b548d993..81976120c2 * tools/clang: 499a012d25..66d5da40df * tools/mb: 10c4d4779d..38995191a8 * tools/perf: f08244f24a..7813c31dc3 * tools/skia_goldctl/linux: UMqOqE8nlXwo9xj56g4W9ySvvqo2Tsw3B6tWZLo19L8C..7Xu0Ohf2xgwAgLoFgq7LiZmi_Uk3x5gIX5Dta-tZg40C * tools/skia_goldctl/mac_amd64: vjY1ew6KN-bIFZEk7IbwPCAb6xZxib9uqLXMwbi8JLQC..KYHtCI8pS_1-ZVhMhj0d7h-3H8ZdNtaGLYsYnDqRbnMC * tools/skia_goldctl/mac_arm64: twOZsJTmRSqlOwstPpWMhT_fXhiOaijMu24-UJLGK20C..h-5CLVE7g4EEE3-uXZ610OaDlIMoYEx3RLgGWHXRA9AC * tools/skia_goldctl/win: wveYksSfL51dPfdRZ5474IFmCMkL8gg6ygZxxPdBezAC..VWg6iFKkt4rAdHxGoJNLVlgsRlbT-Woz_41P6cFybmYC No update to Clang. Bug: angleproject:8178 Tbr: geofflang@google.com Change-Id: Id46eb10ca81c88f396e42c17b55ead4f77af08c9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4593140 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>
2026-01-06 02:09:55 +03:00 · 2023-06-06 09:54:37 +00:00
parent f7badd3faa
commit 31aa3fa5da
6 changed files with 27 additions and 24 deletions
--- a/36
+++ b/36
@@ -43,7 +43,7 @@ vars = {
  'checkout_angle_mesa': False,

  # Version of Chromium our Chromium-based DEPS are mirrored from.
-  'chromium_revision': 'd6f22a2a164b13fe771e4bd34e4afaac685ae18a',
+  'chromium_revision': '9e0b5e8b8a85cdf80fd0e49bd64f7385aab83a78',
  # We never want to checkout chromium,
  # but need a dummy DEPS entry for the autoroller
  'dummy_checkout_chromium': False,
@@ -88,7 +88,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': '146f47b08da10c172121b5801d13038e384b3f14',
+  'catapult_revision': 'dc627ec37b5e130481ac0f51703e5d2ccf87f09a',

  # the commit queue can handle CLs rolling Fuchsia sdk
  # and whatever else without interference from each other.
@@ -140,7 +140,7 @@ vars = {
 deps = {

  'build': {
-    'url': '{chromium_git}/chromium/src/build.git@defeac7e7d4d99097fbfa871eac6fc33653a4ea8',
+    'url': '{chromium_git}/chromium/src/build.git@c884d70f0c7ba6cdf54eefa06a372144c163c565',
    'condition': 'not build_with_chromium',
  },

@@ -187,7 +187,7 @@ deps = {
  },

  'buildtools/third_party/libunwind/trunk': {
-    'url': '{chromium_git}/external/github.com/llvm/llvm-project/libunwind.git@cd144ced35285edaa064a91561969e5b22c219b1',
+    'url': '{chromium_git}/external/github.com/llvm/llvm-project/libunwind.git@b5a43ecdac82a248f8a700a68c722b4d98708377',
    'condition': 'not build_with_chromium',
  },

@@ -203,7 +203,7 @@ deps = {
  },

  'testing': {
-    'url': '{chromium_git}/chromium/src/testing@21f1443014a8e189d0990ee9474fdaa658d45884',
+    'url': '{chromium_git}/chromium/src/testing@098d0a11e4c47d37b092c74a651f43b4f2315813',
    'condition': 'not build_with_chromium',
  },

@@ -385,7 +385,7 @@ deps = {
  },

  'third_party/depot_tools': {
-    'url': '{chromium_git}/chromium/tools/depot_tools.git@9e0ff22bfb3137e9c6b44304671a78c3e3d1e1d9',
+    'url': '{chromium_git}/chromium/tools/depot_tools.git@0d627781be1c6318b9e593545a88c2f6455515e1',
    'condition': 'not build_with_chromium',
  },

@@ -402,7 +402,7 @@ deps = {
  },

  'third_party/flatbuffers/src': {
-    'url': '{chromium_git}/external/github.com/google/flatbuffers.git@a56f9ec50e908362e20254fcef28e62a2f148d91',
+    'url': '{chromium_git}/external/github.com/google/flatbuffers.git@13fc75cb6b7b44793f3f5b4ba025ff403d012c9f',
    'condition': 'checkout_android and not build_with_chromium',
  },

@@ -593,7 +593,7 @@ deps = {
      'packages': [
          {
              'package': 'chromium/third_party/r8',
-              'version': '0LMjUUpzAmxHrlftkzbDAaeuTDNXrOEgTgyJm8qIyvMC',
+              'version': 'iTbMDX2gRMW4nmoA8J7oToRDDsMcjm6hJNVH-RpYKIoC',
          },
      ],
      'condition': 'checkout_android and not build_with_chromium',
@@ -637,7 +637,7 @@ deps = {
      'packages': [
          {
              'package': 'chromium/third_party/turbine',
-              'version': 'Foa7uRpVoKr4YoayCKc9EERkjpmGOE3DAUTWFLL7gKEC',
+              'version': 'G8Cku1fztaDd9to_8gk3PNWM2iRacAxD9zcUAgUPUEAC',
          },
      ],
      'condition': 'checkout_android and not build_with_chromium',
@@ -664,17 +664,17 @@ deps = {
  },

  'third_party/zlib': {
-    'url': '{chromium_git}/chromium/src/third_party/zlib@982b036a257e63240142358a0fce0dbfdd40d9cb',
+    'url': '{chromium_git}/chromium/src/third_party/zlib@9c8e4fdccbc0cb84d5927318c05eb852777442cb',
    'condition': 'not build_with_chromium',
  },

  'tools/android': {
-    'url': '{chromium_git}/chromium/src/tools/android@07b548d9931c5855bbccd2bb1ee4b3d09333b979',
+    'url': '{chromium_git}/chromium/src/tools/android@81976120c20042978d6c977296043a65bf07cb46',
    'condition': 'checkout_android and not build_with_chromium',
  },

  'tools/clang': {
-    'url': '{chromium_git}/chromium/src/tools/clang.git@499a012d25f7e23054d2b2420f5ec47a0956fd9d',
+    'url': '{chromium_git}/chromium/src/tools/clang.git@66d5da40dfae9ed6b412b52a068facb41c42e04d',
    'condition': 'not build_with_chromium',
  },

@@ -705,7 +705,7 @@ deps = {
  },

  'tools/mb': {
-    'url': '{chromium_git}/chromium/src/tools/mb@10c4d4779dafdb88e94b08cca44640fc9d7872cb',
+    'url': '{chromium_git}/chromium/src/tools/mb@38995191a803837a323e9efaa04eac6c9369aa8b',
    'condition': 'not build_with_chromium',
  },

@@ -720,7 +720,7 @@ deps = {
  },

  'tools/perf': {
-    'url': '{chromium_git}/chromium/src/tools/perf@f08244f24acd495460f1089e9575a3f4dc7cc482',
+    'url': '{chromium_git}/chromium/src/tools/perf@7813c31dc31690059962f4a88edeb70aae00bba0',
    'condition': 'not build_with_chromium',
  },

@@ -738,7 +738,7 @@ deps = {
      'packages': [
        {
          'package': 'skia/tools/goldctl/linux-amd64',
-          'version': 'UMqOqE8nlXwo9xj56g4W9ySvvqo2Tsw3B6tWZLo19L8C',
+          'version': '7Xu0Ohf2xgwAgLoFgq7LiZmi_Uk3x5gIX5Dta-tZg40C',
        },
      ],
      'dep_type': 'cipd',
@@ -749,7 +749,7 @@ deps = {
      'packages': [
        {
          'package': 'skia/tools/goldctl/windows-amd64',
-          'version': 'wveYksSfL51dPfdRZ5474IFmCMkL8gg6ygZxxPdBezAC',
+          'version': 'VWg6iFKkt4rAdHxGoJNLVlgsRlbT-Woz_41P6cFybmYC',
        },
      ],
      'dep_type': 'cipd',
@@ -760,7 +760,7 @@ deps = {
      'packages': [
        {
          'package': 'skia/tools/goldctl/mac-amd64',
-          'version': 'vjY1ew6KN-bIFZEk7IbwPCAb6xZxib9uqLXMwbi8JLQC',
+          'version': 'KYHtCI8pS_1-ZVhMhj0d7h-3H8ZdNtaGLYsYnDqRbnMC',
        },
      ],
      'dep_type': 'cipd',
@@ -771,7 +771,7 @@ deps = {
      'packages': [
        {
          'package': 'skia/tools/goldctl/mac-arm64',
-          'version': 'twOZsJTmRSqlOwstPpWMhT_fXhiOaijMu24-UJLGK20C',
+          'version': 'h-5CLVE7g4EEE3-uXZ610OaDlIMoYEx3RLgGWHXRA9AC',
        },
      ],
      'dep_type': 'cipd',
--- a/scripts/code_generation_hashes/Static_builtins.json
+++ b/scripts/code_generation_hashes/Static_builtins.json
@@ -16,7 +16,7 @@
  "src/compiler/translator/builtin_variables.json":
    "6ed79ceeb34953153925f7e473177321",
  "src/compiler/translator/gen_builtin_symbols.py":
-    "2bcd07edef829c70871d1456d0c89bc5",
+    "a4fa6c6a40cb82949ca4e2986a1d4de4",
  "src/compiler/translator/tree_util/BuiltIn_ESSL_autogen.h":
    "d6c16bf2d2ea5d02c702585725fd06cb",
  "src/compiler/translator/tree_util/BuiltIn_complete_autogen.h":
--- a/scripts/code_generation_hashes/Test_spec_JSON.json
+++ b/scripts/code_generation_hashes/Test_spec_JSON.json
@@ -14,7 +14,7 @@
  "infra/specs/waterfalls.pyl":
    "47cb97b7a7f0e61140d4ff869b14c815",
  "testing/buildbot/generate_buildbot_json.py":
-    "dbc47ef93b52a4af1fc351125746ee0f",
+    "981e4588c647f09b090f028bd9816d51",
  "testing/buildbot/mixins.pyl":
    "b723794323c54d0d0a9263e0bbfab9a9"
 }
--- a/scripts/code_generation_hashes/overlay_fonts.json
+++ b/scripts/code_generation_hashes/overlay_fonts.json
@@ -4,5 +4,5 @@
  "src/libANGLE/Overlay_font_autogen.h":
    "ca2e38137ec27572e2ad695ff89f464d",
  "src/libANGLE/gen_overlay_fonts.py":
-    "7ad77669b7b725460e184d23b97c377c"
+    "29c481b06e0a10c92780785eaa5b609e"
 }
--- a/third_party/flatbuffers/BUILD.gn
+++ b/third_party/flatbuffers/BUILD.gn
@@ -6,7 +6,10 @@ import("//testing/test.gni")
 import("//third_party/flatbuffers/flatbuffer.gni")

 config("flatbuffers_config") {
-  include_dirs = [ "src/include" ]
+  include_dirs = [
+    "src/include",
+    "src/src",
+  ]

  # Required to prevent static initialization of locale
  # in util.cpp
--- a/third_party/flatbuffers/README.chromium
+++ b/third_party/flatbuffers/README.chromium
@@ -1,8 +1,8 @@
 Name: FlatBuffers
 Short Name: flatbuffers
 URL: https://github.com/google/flatbuffers
-Version: a56f9ec50e908362e20254fcef28e62a2f148d91
-Date: 2023-02-16
+Version: 13fc75cb6b7b44793f3f5b4ba025ff403d012c9f
+Date: 2023-06-05
 License: Apache 2.0
 License File: LICENSE
 Security Critical: yes