From b7e009ca24b03ad2544c10d63369ab5cd8dc5488 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Thu, 8 May 2025 12:54:26 -0700 Subject: [PATCH] Exclude a specific auto-generated Dart file from engine license checks (#168544) Manual cherrypick of https://github.com/flutter/flutter/pull/168508. Closes https://github.com/flutter/flutter/issues/168493. --- engine/src/flutter/ci/licenses_golden/excluded_files | 1 + engine/src/flutter/ci/licenses_golden/licenses_dart | 6 +----- engine/src/flutter/ci/licenses_golden/tool_signature | 2 +- engine/src/flutter/tools/licenses/lib/paths.dart | 1 + 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/engine/src/flutter/ci/licenses_golden/excluded_files b/engine/src/flutter/ci/licenses_golden/excluded_files index 053b7e2452..c8691cd8db 100644 --- a/engine/src/flutter/ci/licenses_golden/excluded_files +++ b/engine/src/flutter/ci/licenses_golden/excluded_files @@ -1672,6 +1672,7 @@ ../../../flutter/third_party/dart/sdk/lib/svg/dart2js ../../../flutter/third_party/dart/sdk/lib/vmservice_libraries.json ../../../flutter/third_party/dart/sdk/lib/vmservice_libraries.yaml +../../../flutter/third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart ../../../flutter/third_party/dart/sdk/version ../../../flutter/third_party/dart/sdk_packages.yaml ../../../flutter/third_party/dart/tests diff --git a/engine/src/flutter/ci/licenses_golden/licenses_dart b/engine/src/flutter/ci/licenses_golden/licenses_dart index df73f9d8f9..0e14926dad 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_dart +++ b/engine/src/flutter/ci/licenses_golden/licenses_dart @@ -1,4 +1,4 @@ -Signature: c96f6439e1d3cadfbb6adc790efdcc37 +Signature: e41496825525b0b25bd65a5a8e93c81a ==================================================================================================== LIBRARY: dart @@ -842,7 +842,6 @@ ORIGIN: ../../../flutter/third_party/dart/sdk/lib/isolate/isolate.dart + ../../. ORIGIN: ../../../flutter/third_party/dart/sdk/lib/math/math.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/math/random.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart + ../../../flutter/third_party/dart/LICENSE -ORIGIN: ../../../flutter/third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart + ../../../flutter/third_party/dart/LICENSE TYPE: LicenseType.bsd FILE: ../../../flutter/third_party/dart/runtime/bin/builtin.cc @@ -1191,7 +1190,6 @@ FILE: ../../../flutter/third_party/dart/sdk/lib/isolate/isolate.dart FILE: ../../../flutter/third_party/dart/sdk/lib/math/math.dart FILE: ../../../flutter/third_party/dart/sdk/lib/math/random.dart FILE: ../../../flutter/third_party/dart/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart -FILE: ../../../flutter/third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart FILE: ../../../flutter/third_party/dart/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart ---------------------------------------------------------------------------------------------------- Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file @@ -1507,7 +1505,6 @@ ORIGIN: ../../../flutter/third_party/dart/sdk/lib/vmservice/message.dart + ../.. ORIGIN: ../../../flutter/third_party/dart/sdk/lib/vmservice/message_router.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/vmservice/running_isolate.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/vmservice/running_isolates.dart + ../../../flutter/third_party/dart/LICENSE -ORIGIN: ../../../flutter/third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/utils/compiler/create_snapshot_entry.dart + ../../../flutter/third_party/dart/LICENSE TYPE: LicenseType.bsd FILE: ../../../flutter/third_party/dart/runtime/bin/eventhandler_win.cc @@ -1792,7 +1789,6 @@ FILE: ../../../flutter/third_party/dart/sdk/lib/vmservice/message.dart FILE: ../../../flutter/third_party/dart/sdk/lib/vmservice/message_router.dart FILE: ../../../flutter/third_party/dart/sdk/lib/vmservice/running_isolate.dart FILE: ../../../flutter/third_party/dart/sdk/lib/vmservice/running_isolates.dart -FILE: ../../../flutter/third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart FILE: ../../../flutter/third_party/dart/utils/compiler/create_snapshot_entry.dart ---------------------------------------------------------------------------------------------------- Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file diff --git a/engine/src/flutter/ci/licenses_golden/tool_signature b/engine/src/flutter/ci/licenses_golden/tool_signature index ece9890fea..16f57803c0 100644 --- a/engine/src/flutter/ci/licenses_golden/tool_signature +++ b/engine/src/flutter/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 72079bc1edfa9c01900da12816e18f0e +Signature: 05c5162009fbeea0e177225292e649c4 diff --git a/engine/src/flutter/tools/licenses/lib/paths.dart b/engine/src/flutter/tools/licenses/lib/paths.dart index 09033686e0..099f144068 100644 --- a/engine/src/flutter/tools/licenses/lib/paths.dart +++ b/engine/src/flutter/tools/licenses/lib/paths.dart @@ -69,6 +69,7 @@ final Set skippedPaths = { r'flutter/third_party/dart/sdk/lib/html/dart2js', // generated from other sources r'flutter/third_party/dart/sdk/lib/html/doc', r'flutter/third_party/dart/sdk/lib/svg/dart2js', // generated from other sources + r'flutter/third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart', // generated from other sources r'flutter/third_party/dart/third_party/binary_size', // not linked in r'flutter/third_party/dart/third_party/binaryen', // not linked in r'flutter/third_party/dart/third_party/d3', // Siva says "that is the charting library used by the binary size tool"