Skip to content

Commit 36b1ae3

Browse files
loic-sharmaloic-sharma
authored
Roll ANGLE, vulkan-deps, and shaderc (flutter#36389)
This change updates ANGLE to a version that contains [angle#3906325](https://chromium-review.googlesource.com/c/angle/angle/+/3906325), which fixes the COM error reported in flutter/flutter#110948. This also updates vulkan-deps and shaderc as these are dependencies of ANGLE. Part of flutter/flutter#110948
1 parent 5e1f1ae commit 36b1ae3

File tree

5 files changed

+66
-31
lines changed

5 files changed

+66
-31
lines changed

‎DEPS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@ deps = {
142142
Var('fuchsia_git') + '/third_party/glfw' + '@' + '78e6a0063d27ed44c2c4805606309744f6fb29fc',
143143

144144
'src/third_party/shaderc':
145-
Var('github_git') + '/google/shaderc.git' + '@' + '948660cccfbbc303d2590c7f44a4cee40b66fdd6',
145+
Var('github_git') + '/google/shaderc.git' + '@' + '7ea834ecc59258a5c13c3d3e6fa0582bdde7c543',
146146

147147
'src/third_party/vulkan-deps':
148-
Var('chromium_git') + '/vulkan-deps' + '@' + '9bb79e503dd5f60d14d46712d51bda9c9dd8f2d3',
148+
Var('chromium_git') + '/vulkan-deps' + '@' + 'afc444a0f49a09f67b3dc63ddcd14e2031466ffa',
149149

150150
'src/third_party/flatbuffers':
151151
Var('github_git') + '/google/flatbuffers.git' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
@@ -474,7 +474,7 @@ deps = {
474474
Var('swiftshader_git') + '/SwiftShader.git' + '@' + 'bea8d2471bd912220ba59032e0738f3364632657',
475475

476476
'src/third_party/angle':
477-
Var('chromium_git') + '/angle/angle.git' + '@' + '3faaded8234b31dea24c929e40e33089a34a9aa5',
477+
Var('chromium_git') + '/angle/angle.git' + '@' + '094b49db60cb48ee932a875898b57accbfa656de',
478478

479479
'src/third_party/vulkan_memory_allocator':
480480
Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + '7de5cc00de50e71a3aab22dea52fbb7ff4efceb6',

‎ci/licenses_golden/licenses_third_party‎

Lines changed: 51 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 13f254f7438eedf72d1e436bc270fb5c
1+
Signature: 415d338edcb980960efe1fe9e47ab370
22

33
UNUSED LICENSES:
44

@@ -1327,10 +1327,7 @@ FILE: ../../../third_party/angle/include/GLES/egl.h
13271327
FILE: ../../../third_party/angle/include/GLES/glplatform.h
13281328
FILE: ../../../third_party/angle/include/GLES2/gl2platform.h
13291329
FILE: ../../../third_party/angle/include/GLES3/gl3platform.h
1330-
FILE: ../../../third_party/angle/scripts/cl.xml
1331-
FILE: ../../../third_party/angle/scripts/egl.xml
13321330
FILE: ../../../third_party/angle/scripts/gl.xml
1333-
FILE: ../../../third_party/angle/scripts/wgl.xml
13341331
FILE: ../../../third_party/angle/src/android_system_settings/res/layout/fragment.xml
13351332
FILE: ../../../third_party/angle/src/android_system_settings/res/values-af/strings.xml
13361333
FILE: ../../../third_party/angle/src/android_system_settings/res/values-am/strings.xml
@@ -2220,6 +2217,7 @@ FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_
22202217
FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_raii.hpp
22212218
FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_screen.h
22222219
FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_structs.hpp
2220+
FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_to_string.hpp
22232221
FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_vi.h
22242222
FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_wayland.h
22252223
FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_win32.h
@@ -18724,8 +18722,9 @@ FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ProgramPipelineVk.
1872418722
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ProgramPipelineVk.h
1872518723
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ResourceVk.cpp
1872618724
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ResourceVk.h
18727-
FILE: ../../../third_party/angle/src/libGL/proc_table_wgl.h
1872818725
FILE: ../../../third_party/angle/src/libGLESv2/proc_table_egl.h
18726+
FILE: ../../../third_party/angle/src/libGLESv2/proc_table_glx.h
18727+
FILE: ../../../third_party/angle/src/libGLESv2/proc_table_wgl.h
1872918728
----------------------------------------------------------------------------------------------------
1873018729
Copyright 2017 The ANGLE Project Authors. All rights reserved.
1873118730

@@ -19160,8 +19159,6 @@ FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/Overla
1916019159
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_mandatory_format_support_data.json
1916119160
FILE: ../../../third_party/angle/src/libEGL/libEGL.rc
1916219161
FILE: ../../../third_party/angle/src/libEGL/resource.h
19163-
FILE: ../../../third_party/angle/src/libGL/libGL.rc
19164-
FILE: ../../../third_party/angle/src/libGL/resource.h
1916519162
FILE: ../../../third_party/angle/src/libGLESv1_CM/libGLESv1_CM.def
1916619163
FILE: ../../../third_party/angle/src/libGLESv1_CM/libGLESv1_CM.rc
1916719164
FILE: ../../../third_party/angle/src/libGLESv1_CM/resource.h
@@ -19757,10 +19754,11 @@ FILE: ../../../third_party/angle/src/libANGLE/validationGL1.cpp
1975719754
FILE: ../../../third_party/angle/src/libANGLE/validationGL2.cpp
1975819755
FILE: ../../../third_party/angle/src/libANGLE/validationGL3.cpp
1975919756
FILE: ../../../third_party/angle/src/libANGLE/validationGL4.cpp
19760-
FILE: ../../../third_party/angle/src/libGL/entry_points_wgl.cpp
19761-
FILE: ../../../third_party/angle/src/libGL/entry_points_wgl.h
19762-
FILE: ../../../third_party/angle/src/libGL/proc_table_wgl_autogen.cpp
19757+
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_wgl.cpp
19758+
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_wgl.h
1976319759
FILE: ../../../third_party/angle/src/libGLESv2/proc_table_egl_autogen.cpp
19760+
FILE: ../../../third_party/angle/src/libGLESv2/proc_table_glx_autogen.cpp
19761+
FILE: ../../../third_party/angle/src/libGLESv2/proc_table_wgl_autogen.cpp
1976419762
FILE: ../../../third_party/angle/util/Timer.cpp
1976519763
FILE: ../../../third_party/angle/util/Timer.h
1976619764
FILE: ../../../third_party/angle/util/fuchsia/ScenicWindow.cpp
@@ -20054,8 +20052,6 @@ FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RemoveAtomicCo
2005420052
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RemoveAtomicCounterBuiltins.h
2005520053
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/RecordUniformBlocksWithLargeArrayMember.cpp
2005620054
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/RecordUniformBlocksWithLargeArrayMember.h
20057-
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.cpp
20058-
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.h
2005920055
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/FlagSamplersWithTexelFetch.cpp
2006020056
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/FlagSamplersWithTexelFetch.h
2006120057
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/ReplaceForShaderFramebufferFetch.cpp
@@ -20099,6 +20095,14 @@ FILE: ../../../third_party/angle/src/libANGLE/InfoLog.h
2009920095
FILE: ../../../third_party/angle/src/libANGLE/ProgramExecutable.cpp
2010020096
FILE: ../../../third_party/angle/src/libANGLE/ProgramExecutable.h
2010120097
FILE: ../../../third_party/angle/src/libANGLE/angletypes_unittest.cpp
20098+
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_1_autogen.cpp
20099+
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_1_autogen.h
20100+
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_2_autogen.cpp
20101+
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_2_autogen.h
20102+
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_3_autogen.cpp
20103+
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_3_autogen.h
20104+
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_4_autogen.cpp
20105+
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_4_autogen.h
2010220106
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_1_0_autogen.cpp
2010320107
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_1_0_autogen.h
2010420108
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_2_0_autogen.cpp
@@ -20122,7 +20126,6 @@ FILE: ../../../third_party/angle/src/libANGLE/renderer/EGLReusableSync.h
2012220126
FILE: ../../../third_party/angle/src/libANGLE/renderer/EGLSyncImpl.cpp
2012320127
FILE: ../../../third_party/angle/src/libANGLE/renderer/FormatID_autogen.h
2012420128
FILE: ../../../third_party/angle/src/libANGLE/renderer/Format_table_autogen.cpp
20125-
FILE: ../../../third_party/angle/src/libANGLE/renderer/ProgramPipelineImpl.cpp
2012620129
FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/driver_utils_d3d.cpp
2012720130
FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/driver_utils_d3d.h
2012820131
FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d_format.cpp
@@ -20215,16 +20218,6 @@ FILE: ../../../third_party/angle/src/libANGLE/validationGL46_autogen.h
2021520218
FILE: ../../../third_party/angle/src/libANGLE/validationGL4_autogen.h
2021620219
FILE: ../../../third_party/angle/src/libEGL/libEGL_autogen.cpp
2021720220
FILE: ../../../third_party/angle/src/libEGL/libEGL_autogen.def
20218-
FILE: ../../../third_party/angle/src/libGL/entry_points_gl_1_autogen.cpp
20219-
FILE: ../../../third_party/angle/src/libGL/entry_points_gl_1_autogen.h
20220-
FILE: ../../../third_party/angle/src/libGL/entry_points_gl_2_autogen.cpp
20221-
FILE: ../../../third_party/angle/src/libGL/entry_points_gl_2_autogen.h
20222-
FILE: ../../../third_party/angle/src/libGL/entry_points_gl_3_autogen.cpp
20223-
FILE: ../../../third_party/angle/src/libGL/entry_points_gl_3_autogen.h
20224-
FILE: ../../../third_party/angle/src/libGL/entry_points_gl_4_autogen.cpp
20225-
FILE: ../../../third_party/angle/src/libGL/entry_points_gl_4_autogen.h
20226-
FILE: ../../../third_party/angle/src/libGL/libGL_autogen.cpp
20227-
FILE: ../../../third_party/angle/src/libGL/libGL_autogen.def
2022820221
FILE: ../../../third_party/angle/src/libGLESv2/egl_ext_stubs.cpp
2022920222
FILE: ../../../third_party/angle/src/libGLESv2/egl_ext_stubs_autogen.h
2023020223
FILE: ../../../third_party/angle/src/libGLESv2/egl_get_labeled_object_data.json
@@ -20236,6 +20229,14 @@ FILE: ../../../third_party/angle/src/libGLESv2/entry_points_egl_autogen.cpp
2023620229
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_egl_autogen.h
2023720230
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_egl_ext_autogen.cpp
2023820231
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_egl_ext_autogen.h
20232+
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gl_1_autogen.cpp
20233+
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gl_1_autogen.h
20234+
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gl_2_autogen.cpp
20235+
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gl_2_autogen.h
20236+
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gl_3_autogen.cpp
20237+
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gl_3_autogen.h
20238+
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gl_4_autogen.cpp
20239+
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gl_4_autogen.h
2023920240
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gles_1_0_autogen.cpp
2024020241
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gles_1_0_autogen.h
2024120242
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gles_2_0_autogen.cpp
@@ -20252,6 +20253,8 @@ FILE: ../../../third_party/angle/src/libGLESv2/libGLESv2_autogen.cpp
2025220253
FILE: ../../../third_party/angle/src/libGLESv2/libGLESv2_autogen.def
2025320254
FILE: ../../../third_party/angle/src/libGLESv2/libGLESv2_no_capture_autogen.def
2025420255
FILE: ../../../third_party/angle/src/libGLESv2/libGLESv2_with_capture_autogen.def
20256+
FILE: ../../../third_party/angle/src/libGLESv2/opengl32_autogen.def
20257+
FILE: ../../../third_party/angle/src/libGLESv2/opengl32_with_wgl_autogen.def
2025520258
FILE: ../../../third_party/angle/src/libOpenCL/libOpenCL_autogen.cpp
2025620259
FILE: ../../../third_party/angle/util/capture/angle_trace_gl.h
2025720260
FILE: ../../../third_party/angle/util/capture/frame_capture_test_utils.h
@@ -20737,10 +20740,15 @@ FILE: ../../../third_party/angle/include/platform/frontend_features.json
2073720740
FILE: ../../../third_party/angle/include/platform/gl_features.json
2073820741
FILE: ../../../third_party/angle/include/platform/mtl_features.json
2073920742
FILE: ../../../third_party/angle/include/platform/vk_features.json
20743+
FILE: ../../../third_party/angle/samples/hello_triangle_gl/HelloTriangleGL.cpp
20744+
FILE: ../../../third_party/angle/scripts/angle_android_codegen.go
20745+
FILE: ../../../third_party/angle/src/common/apple_platform_utils.mm
2074020746
FILE: ../../../third_party/angle/src/compiler/translator/BaseTypes.cpp
2074120747
FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalConstantNames.cpp
2074220748
FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/GuardFragDepthWrite.cpp
2074320749
FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/GuardFragDepthWrite.h
20750+
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RewritePixelLocalStorage.cpp
20751+
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RewritePixelLocalStorage.h
2074420752
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/AggregateAssignArraysInSSBOs.cpp
2074520753
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/AggregateAssignArraysInSSBOs.h
2074620754
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/AggregateAssignStructsInSSBOs.cpp
@@ -20751,14 +20759,33 @@ FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/Emulate
2075120759
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/EmulateDithering.h
2075220760
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/EmulateYUVBuiltIns.cpp
2075320761
FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/EmulateYUVBuiltIns.h
20762+
FILE: ../../../third_party/angle/src/image_util/loadimage_astc.cpp
20763+
FILE: ../../../third_party/angle/src/libANGLE/MemoryShaderCache.cpp
20764+
FILE: ../../../third_party/angle/src/libANGLE/MemoryShaderCache.h
2075420765
FILE: ../../../third_party/angle/src/libANGLE/Overlay_font_autogen.cpp
2075520766
FILE: ../../../third_party/angle/src/libANGLE/Overlay_font_autogen.h
20767+
FILE: ../../../third_party/angle/src/libANGLE/PixelLocalStorage.cpp
20768+
FILE: ../../../third_party/angle/src/libANGLE/PixelLocalStorage.h
2075620769
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_egl.cpp
2075720770
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_egl.h
20771+
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_1_params.cpp
20772+
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_2_params.cpp
20773+
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_3_params.cpp
20774+
FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_4_params.cpp
20775+
FILE: ../../../third_party/angle/src/libANGLE/renderer/FramebufferImpl.cpp
20776+
FILE: ../../../third_party/angle/src/libANGLE/renderer/ProgramImpl.cpp
20777+
FILE: ../../../third_party/angle/src/libANGLE/renderer/ProgramPipelineImpl.cpp
20778+
FILE: ../../../third_party/angle/src/libANGLE/renderer/RenderbufferImpl.cpp
20779+
FILE: ../../../third_party/angle/src/libANGLE/renderer/TransformFeedbackImpl.cpp
20780+
FILE: ../../../third_party/angle/src/libANGLE/renderer/VertexArrayImpl.cpp
20781+
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/Suballocation.cpp
20782+
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/Suballocation.h
2075820783
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/gbm/DisplayVkGbm.cpp
2075920784
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/gbm/DisplayVkGbm.h
2076020785
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/OverlayDraw.frag
2076120786
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/OverlayDraw.vert
20787+
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_glx.cpp
20788+
FILE: ../../../third_party/angle/src/libGLESv2/entry_points_glx.h
2076220789
FILE: ../../../third_party/angle/util/angle_features_autogen.cpp
2076320790
FILE: ../../../third_party/angle/util/angle_features_autogen.h
2076420791
FILE: ../../../third_party/angle/util/linux/LinuxWindow.cpp
@@ -24712,6 +24739,7 @@ FILE: ../../../third_party/angle/include/GLES2/gl2ext.h
2471224739
FILE: ../../../third_party/angle/include/GLES3/gl3.h
2471324740
FILE: ../../../third_party/angle/include/GLES3/gl31.h
2471424741
FILE: ../../../third_party/angle/include/GLES3/gl32.h
24742+
FILE: ../../../third_party/angle/include/GLX/glxext.h
2471524743
FILE: ../../../third_party/json/include/nlohmann/adl_serializer.hpp
2471624744
FILE: ../../../third_party/json/include/nlohmann/byte_container_with_subtype.hpp
2471724745
FILE: ../../../third_party/json/include/nlohmann/detail/abi_macros.hpp

‎ci/licenses_golden/tool_signature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: ebfee4cf8fc59213ae6efbc0c13dc6c8
1+
Signature: 960c777bbc4aed25629fa86a8d7bf10b
22

‎tools/gn‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,17 @@ def to_gn_args(args):
335335
gn_args['host_cpu'] = cpu
336336
gn_args['target_cpu'] = cpu
337337

338-
# macOS host builds (whether x64 or arm64) must currently be built under
339-
# Rosetta on Apple Silicon Macs.
340-
# TODO(cbracken): https://github.com/flutter/flutter/issues/103386
341338
if is_host_build(args) and gn_args['host_os'] == 'mac':
339+
# macOS host builds (whether x64 or arm64) must currently be built under
340+
# Rosetta on Apple Silicon Macs.
341+
# TODO(cbracken): https://github.com/flutter/flutter/issues/103386
342342
gn_args['host_cpu'] = 'x64'
343343

344+
# macOS unit tests include Vulkan headers which reference Metal types
345+
# introduced in macOS 10.14.
346+
gn_args['mac_sdk_min'] = '10.14'
347+
gn_args['mac_deployment_target'] = '10.14.0'
348+
344349
# macOS target builds (whether x64 or arm64) must currently be built under
345350
# Rosetta on Apple Silicon Macs.
346351
# TODO(cbracken): https://github.com/flutter/flutter/issues/103386
@@ -554,11 +559,13 @@ def to_gn_args(args):
554559
get_host_os() == 'win'):
555560
# Do not build unnecessary parts of the ANGLE tree.
556561
gn_args['angle_build_all'] = False
562+
gn_args['angle_has_astc_encoder'] = False
557563
# Force ANGLE context checks on Windows to prevent crashes.
558564
# TODO(loic-sharma): Remove this once ANGLE crashes have been fixed.
559565
# https://github.com/flutter/flutter/issues/114107
560566
if get_host_os() == 'win':
561567
gn_args['angle_force_context_check_every_call'] = True
568+
562569
# Requires RTTI. We may want to build this in debug modes, punting on that
563570
# for now.
564571
gn_args['angle_enable_vulkan_validation_layers'] = False

‎tools/licenses/lib/patterns.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1649,7 +1649,7 @@ final List<RegExp> csLicenses = <RegExp>[
16491649
r'^(?:\1\2)?GNU General Public License for more details.\n'
16501650
r'^(?:\1\2)?\n*'
16511651
r'^(?:\1\2)?You should have received a copy of the GNU General Public License\n'
1652-
r'^(?:\1\2)?along with this program. If not, see <http://www.gnu.org/licenses/>. \*/\n'
1652+
r'^(?:\1\2)?along with this program. If not, see <https?://www.gnu.org/licenses/>. \*/\n'
16531653
r'^(?:\1\2)?\n*' +
16541654
kIndent +
16551655
r'As a special exception, you may create a larger work that contains\n'

0 commit comments

Comments
 (0)