Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fuchsia] Update Fuchsia Linux SDK #34074

Merged
merged 2 commits into from
Jun 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 2 additions & 1 deletion ci/licenses_golden/licenses_fuchsia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 25f3aae76e783057a363d68a61c1e5a3
Signature: d3bf0590201dd1b9a2330d097e98c2a7

UNUSED LICENSES:

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/tool_signature
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Signature: 808fd97f7e34a2388888f371bb74e2fb
Signature: 62f85bbfe0c4ce501a865747f7bb099e

10 changes: 5 additions & 5 deletions tools/licenses/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

entry.name != 'NOTICE.fuchsia'?

}
}

Expand Down