diff --git a/DEPS b/DEPS index ebeca37e8..e3794134f 100644 --- a/DEPS +++ b/DEPS @@ -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', diff --git a/scripts/code_generation_hashes/Static_builtins.json b/scripts/code_generation_hashes/Static_builtins.json index 4c5d20906..948807766 100644 --- 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": diff --git a/scripts/code_generation_hashes/Test_spec_JSON.json b/scripts/code_generation_hashes/Test_spec_JSON.json index 1de513a51..c643fe6e1 100644 --- 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" } diff --git a/scripts/code_generation_hashes/overlay_fonts.json b/scripts/code_generation_hashes/overlay_fonts.json index 70039ca6d..d2edd2a7b 100644 --- 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" } diff --git a/third_party/flatbuffers/BUILD.gn b/third_party/flatbuffers/BUILD.gn index bdef34d8b..bd9d40f06 100644 --- 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 diff --git a/third_party/flatbuffers/README.chromium b/third_party/flatbuffers/README.chromium index ea8687c15..977a14115 100644 --- 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