From 906c4f85f6c1d740ff816524680f065e40d815a2 Mon Sep 17 00:00:00 2001 From: Kaushik Iska Date: Wed, 15 Jun 2022 15:46:10 +0000 Subject: [PATCH 1/2] [fuchsia] Update Fuchsia Linux SDK Updates from `u8Tk-PE38BAM8t0t8H_k5qGf9Gq64gkptq_Cx-9lECcC` to `n1m4LCszZYselTVPAZ2rm9qW8rajZaZFco1rB5J_0G8C`. Also moves the logic to ignore `NOTICE.fuchsia` from `_RepositoryFuchsiaDirectory` to `_RepositoryFuchsiaSdkDirectory`. --- DEPS | 2 +- tools/licenses/lib/main.dart | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DEPS b/DEPS index 8505fc4ecfdc2..5f6551de71bd6 100644 --- a/DEPS +++ b/DEPS @@ -679,7 +679,7 @@ deps = { 'packages': [ { 'package': 'fuchsia/sdk/core/linux-amd64', - 'version': 'u8Tk-PE38BAM8t0t8H_k5qGf9Gq64gkptq_Cx-9lECcC' + 'version': 'n1m4LCszZYselTVPAZ2rm9qW8rajZaZFco1rB5J_0G8C' } ], 'condition': 'host_os == "linux" and not download_fuchsia_sdk', diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart index ab4c2587788d5..3961bfb159619 100644 --- a/tools/licenses/lib/main.dart +++ b/tools/licenses/lib/main.dart @@ -2370,10 +2370,6 @@ class _RepositoryFuchsiaDirectory extends _RepositoryDirectory { @override bool shouldRecurse(fs.IoNode entry) { return entry.name != 'toolchain' - // Applies to NOTICE.fuchsia file. - // This is a file that covers things that contribute to the Fuchsia SDK. - // See: fxb/94240 - && !(entry.name == 'NOTICE.fuchsia') && super.shouldRecurse(entry); } @@ -2405,7 +2401,11 @@ class _RepositoryFuchsiaSdkLinuxDirectory extends _RepositoryDirectory { && entry.name != 'docs' && entry.name != 'images' && entry.name != 'meta' - && entry.name != 'tools'; + && entry.name != 'tools' + // Applies to NOTICE.fuchsia file. + // This is a file that covers things that contribute to the Fuchsia SDK. + // See: fxb/94240 + && !(entry.name == 'NOTICE.fuchsia'); } } From 5ce4573b4d5e112d9dfea1a76e105a721114eab6 Mon Sep 17 00:00:00 2001 From: Kaushik Iska Date: Wed, 15 Jun 2022 16:02:53 +0000 Subject: [PATCH 2/2] fix signature --- ci/licenses_golden/licenses_fuchsia | 3 ++- ci/licenses_golden/tool_signature | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/licenses_golden/licenses_fuchsia b/ci/licenses_golden/licenses_fuchsia index e3b05ad3636ef..5bbc5bc5b7283 100644 --- a/ci/licenses_golden/licenses_fuchsia +++ b/ci/licenses_golden/licenses_fuchsia @@ -1,4 +1,4 @@ -Signature: 25f3aae76e783057a363d68a61c1e5a3 +Signature: d3bf0590201dd1b9a2330d097e98c2a7 UNUSED LICENSES: @@ -3605,6 +3605,7 @@ FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_component_test/lib/src/internal/lo FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_component_test/lib/src/internal/local_component_runner.dart FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_component_test/lib/src/local_component_handles.dart FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_component_test/lib/src/realm_builder.dart +FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/power_metrics.dart FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/overview.fidl FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/overview.fidl FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/overview.fidl diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index 0c09fd6deff2c..3256ee9e84eac 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 808fd97f7e34a2388888f371bb74e2fb +Signature: 62f85bbfe0c4ce501a865747f7bb099e