From e691bf83961d340932b3a9d11231b0f0e566932b Mon Sep 17 00:00:00 2001 From: Dan Field Date: Mon, 27 Nov 2023 11:05:19 -0800 Subject: [PATCH 1/2] Roll shaderc to google/shaderc@37e25539ce199ecaf19fb7f7d27818716d36686d --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 46394c2443a10..264c0f7c3cf70 100644 --- a/DEPS +++ b/DEPS @@ -285,7 +285,7 @@ deps = { Var('fuchsia_git') + '/third_party/glfw' + '@' + 'dd8a678a66f1967372e5a5e3deac41ebf65ee127', 'src/flutter/third_party/shaderc': - Var('chromium_git') + '/external/github.com/google/shaderc' + '@' + '7ea834ecc59258a5c13c3d3e6fa0582bdde7c543', + Var('chromium_git') + '/external/github.com/google/shaderc' + '@' + '37e25539ce199ecaf19fb7f7d27818716d36686d', 'src/third_party/vulkan-deps': Var('chromium_git') + '/vulkan-deps' + '@' + '40b75117a60b11c42a1fb87bf14c0f49bcdb8b3d', From 9e1462d3936a6b2f9e1c1c2f9954b5f507880ef5 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Mon, 27 Nov 2023 11:23:55 -0800 Subject: [PATCH 2/2] licenses --- ci/licenses_golden/excluded_files | 1 + ci/licenses_golden/licenses_flutter | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index eeb9b677585c5..9c022b4adaf83 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -697,6 +697,7 @@ ../../../flutter/third_party/rapidjson/test ../../../flutter/third_party/shaderc/.clang-format ../../../flutter/third_party/shaderc/.git +../../../flutter/third_party/shaderc/.github ../../../flutter/third_party/shaderc/.gitignore ../../../flutter/third_party/shaderc/AUTHORS ../../../flutter/third_party/shaderc/Android.mk diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index 8b437f782eb2b..34ad289b5f0c7 100644 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -392,7 +392,6 @@ ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutte ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/continuous_clang_asan.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/continuous_clang_debug.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/continuous_clang_release.cfg -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/continuous_gcc_coverage.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/continuous_gcc_debug.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/continuous_gcc_debug_exception.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/continuous_gcc_release.cfg @@ -401,10 +400,10 @@ ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutte ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_clang_asan.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_clang_debug.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_clang_release.cfg -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_gcc_coverage.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_gcc_debug.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_gcc_release.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_license_check.cfg +ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_mingw_release.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/macos/continuous_clang_debug.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/macos/continuous_clang_release.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/macos/presubmit_clang_debug.cfg @@ -412,11 +411,13 @@ ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutte ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/ndk-build/continuous_khronos.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/ndk-build/presubmit_khronos.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/continuous_debug_2017.cfg -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/continuous_release_2015.cfg +ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/continuous_debug_2019.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/continuous_release_2017.cfg +ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/continuous_release_2019.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_debug_2017.cfg -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_release_2015.cfg +ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_debug_2019.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_release_2017.cfg +ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_release_2019.cfg ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc/include/shaderc/env.h ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc/include/shaderc/shaderc.h ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc/include/shaderc/shaderc.hpp @@ -796,7 +797,6 @@ FILE: ../../../flutter/third_party/shaderc/kokoro/img/windows.png FILE: ../../../flutter/third_party/shaderc/kokoro/linux/continuous_clang_asan.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/linux/continuous_clang_debug.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/linux/continuous_clang_release.cfg -FILE: ../../../flutter/third_party/shaderc/kokoro/linux/continuous_gcc_coverage.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/linux/continuous_gcc_debug.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/linux/continuous_gcc_debug_exception.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/linux/continuous_gcc_release.cfg @@ -805,10 +805,10 @@ FILE: ../../../flutter/third_party/shaderc/kokoro/linux/continuous_mingw_release FILE: ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_clang_asan.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_clang_debug.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_clang_release.cfg -FILE: ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_gcc_coverage.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_gcc_debug.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_gcc_release.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_license_check.cfg +FILE: ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_mingw_release.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/macos/continuous_clang_debug.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/macos/continuous_clang_release.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/macos/presubmit_clang_debug.cfg @@ -816,11 +816,13 @@ FILE: ../../../flutter/third_party/shaderc/kokoro/macos/presubmit_clang_release. FILE: ../../../flutter/third_party/shaderc/kokoro/ndk-build/continuous_khronos.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/ndk-build/presubmit_khronos.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/windows/continuous_debug_2017.cfg -FILE: ../../../flutter/third_party/shaderc/kokoro/windows/continuous_release_2015.cfg +FILE: ../../../flutter/third_party/shaderc/kokoro/windows/continuous_debug_2019.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/windows/continuous_release_2017.cfg +FILE: ../../../flutter/third_party/shaderc/kokoro/windows/continuous_release_2019.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_debug_2017.cfg -FILE: ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_release_2015.cfg +FILE: ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_debug_2019.cfg FILE: ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_release_2017.cfg +FILE: ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_release_2019.cfg FILE: ../../../flutter/third_party/shaderc/libshaderc/include/shaderc/env.h FILE: ../../../flutter/third_party/shaderc/libshaderc/include/shaderc/shaderc.h FILE: ../../../flutter/third_party/shaderc/libshaderc/include/shaderc/shaderc.hpp