Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 670701a

Browse files
zandersozanderso
authored
Roll Fuchsia with license script fix (#45498)
For flutter/flutter#134042
1 parent 70fe459 commit 670701a

File tree

5 files changed

+26
-3
lines changed

5 files changed

+26
-3
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ deps = {
924924
'packages': [
925925
{
926926
'package': 'fuchsia/sdk/core/linux-amd64',
927-
'version': 'z9uQ0mXwjKFQF05XlBv-X8Em1QvkefyGcIJWrSZEm-sC'
927+
'version': '8dgICHnG28wNHzoz33qFF_nQu52I3PVTfNbXzV6PWTQC'
928928
}
929929
],
930930
'condition': 'host_os == "linux" and not download_fuchsia_sdk',

‎ci/licenses_golden/excluded_files‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,8 @@
624624
../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.softmac/meta.json
625625
../../../fuchsia/sdk/linux/fidl/zx/meta.json
626626
../../../fuchsia/sdk/linux/meta
627+
../../../fuchsia/sdk/linux/packages/blobs
628+
../../../fuchsia/sdk/linux/packages/realm_builder_server/meta.json
627629
../../../fuchsia/sdk/linux/pkg/async-cpp/meta.json
628630
../../../fuchsia/sdk/linux/pkg/async-default/meta.json
629631
../../../fuchsia/sdk/linux/pkg/async-loop-cpp/meta.json

‎ci/licenses_golden/licenses_fuchsia‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 9a31319fc49dcb0a9eed7caba8bc94aa
1+
Signature: ba6463628187613a22cdde62a73696f0
22

33
====================================================================================================
44
LIBRARY: fuchsia_sdk
@@ -536,6 +536,12 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libpthread.so
536536
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/librt.so
537537
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libzircon.so
538538
FILE: ../../../fuchsia/sdk/linux/data/config/symbol_index/config.json
539+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64/release/content_checklist_path
540+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64/release/package_manifest.json
541+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64/release/content_checklist_path
542+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64/release/package_manifest.json
543+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64/release/content_checklist_path
544+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64/release/package_manifest.json
539545
FILE: ../../../fuchsia/sdk/linux/pkg/async-default/async-default.ifs
540546
FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_shared_lib/driver_runtime.ifs
541547
FILE: ../../../fuchsia/sdk/linux/pkg/fdio/fdio.ifs
@@ -2340,6 +2346,12 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libpthread.so
23402346
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/librt.so
23412347
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libzircon.so
23422348
FILE: ../../../fuchsia/sdk/linux/data/config/symbol_index/config.json
2349+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64/release/content_checklist_path
2350+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64/release/package_manifest.json
2351+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64/release/content_checklist_path
2352+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64/release/package_manifest.json
2353+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64/release/content_checklist_path
2354+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64/release/package_manifest.json
23432355
FILE: ../../../fuchsia/sdk/linux/pkg/async-default/async-default.ifs
23442356
FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_shared_lib/driver_runtime.ifs
23452357
FILE: ../../../fuchsia/sdk/linux/pkg/fdio/fdio.ifs
@@ -4242,6 +4254,7 @@ ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/clock.fidl + ../.
42424254
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/common.fidl + ../../../fuchsia/sdk/linux/LICENSE
42434255
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/composite.fidl + ../../../fuchsia/sdk/linux/LICENSE
42444256
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/composite_connector.fidl + ../../../fuchsia/sdk/linux/LICENSE
4257+
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/device_type.fidl + ../../../fuchsia/sdk/linux/LICENSE
42454258
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/plug.fidl + ../../../fuchsia/sdk/linux/LICENSE
42464259
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/ring_buffer_format.fidl + ../../../fuchsia/sdk/linux/LICENSE
42474260
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/history.fidl + ../../../fuchsia/sdk/linux/LICENSE
@@ -4299,6 +4312,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/clock.fidl
42994312
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/common.fidl
43004313
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/composite.fidl
43014314
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/composite_connector.fidl
4315+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/device_type.fidl
43024316
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/plug.fidl
43034317
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/ring_buffer_format.fidl
43044318
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/history.fidl
@@ -4908,6 +4922,12 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libpthread.so
49084922
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/librt.so
49094923
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libzircon.so
49104924
FILE: ../../../fuchsia/sdk/linux/data/config/symbol_index/config.json
4925+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64/release/content_checklist_path
4926+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64/release/package_manifest.json
4927+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64/release/content_checklist_path
4928+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64/release/package_manifest.json
4929+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64/release/content_checklist_path
4930+
FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64/release/package_manifest.json
49114931
FILE: ../../../fuchsia/sdk/linux/pkg/async-default/async-default.ifs
49124932
FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_shared_lib/driver_runtime.ifs
49134933
FILE: ../../../fuchsia/sdk/linux/pkg/fdio/fdio.ifs

‎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: 996bda987bb421e5aecf9238c247c296
1+
Signature: 575f2a41ff152394b7e539742fa248e6
22

‎tools/licenses/lib/paths.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ final Set<String> skippedPaths = <String>{
3838
r'fuchsia/sdk/linux/docs',
3939
r'fuchsia/sdk/linux/meta',
4040
r'fuchsia/sdk/linux/NOTICE.fuchsia', // covers things that contribute to the Fuchsia SDK; see fxb/94240
41+
r'fuchsia/sdk/linux/packages/blobs', // See https://github.com/flutter/flutter/issues/134042.
4142
r'fuchsia/sdk/linux/tools',
4243
r'fuchsia/sdk/mac/docs',
4344
r'fuchsia/sdk/mac/meta',

0 commit comments

Comments
 (0)