Skip to content

Commit fa72fdb

Browse files
NoamDevNoamDev
authored
Revert "Roll fuchsia/sdk/core/linux-amd64 from Bmq1m... to J-_s6... (flutter#16592)"
This reverts commit 6ba0793.
1 parent cf1ab03 commit fa72fdb

File tree

3 files changed

+14
-83
lines changed

3 files changed

+14
-83
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ deps = {
565565
'packages': [
566566
{
567567
'package': 'fuchsia/sdk/core/linux-amd64',
568-
'version': 'J-_s6YO0ML66YltKrjThDCp3GKLZf1vNz4HPeZZ6UxUC'
568+
'version': 'Bmq1mpid-GcY6qBE23OaJ0hQ3UND90W0QIViirMAusAC'
569569
}
570570
],
571571
'condition': 'host_os == "linux"',

‎ci/licenses_golden/licenses_fuchsia‎

Lines changed: 13 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 62f3625f7edfaf1eb7cdd4c562ac3ea5
1+
Signature: 09932dd69984436b27d6bb1c9f8af60b
22

33
UNUSED LICENSES:
44

@@ -449,7 +449,6 @@ FILE: ../../../fuchsia/sdk/linux/device/qemu-x64.json
449449
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/meta.json
450450
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth.oldtokens/meta.json
451451
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/meta.json
452-
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.a2dp/meta.json
453452
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.control/meta.json
454453
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/meta.json
455454
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/meta.json
@@ -488,7 +487,6 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sounds/meta.json
488487
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/meta.json
489488
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediacodec/meta.json
490489
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/meta.json
491-
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.memorypressure/meta.json
492490
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.migration/meta.json
493491
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular.auth/meta.json
494492
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular.session/meta.json
@@ -522,6 +520,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.lifecycle/meta.json
522520
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/meta.json
523521
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/meta.json
524522
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.types/meta.json
523+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.vectorial/meta.json
525524
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/meta.json
526525
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.channel/meta.json
527526
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.channelcontrol/meta.json
@@ -916,7 +915,6 @@ FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/wordexp.h
916915
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/exception.h
917916
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/clock.h
918917
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/definitions.h
919-
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/scheduler.h
920918
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/Scrt1.o
921919
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libc.so
922920
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libdl.so
@@ -1172,7 +1170,6 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/wordexp.h
11721170
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/exception.h
11731171
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/clock.h
11741172
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/definitions.h
1175-
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/scheduler.h
11761173
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/Scrt1.o
11771174
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libc.so
11781175
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libdl.so
@@ -1327,7 +1324,6 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/semantics_
13271324
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth.oldtokens/credentials_producer.fidl
13281325
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth.oldtokens/meta.json
13291326
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/meta.json
1330-
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.a2dp/meta.json
13311327
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.control/meta.json
13321328
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.control/pairing_options.fidl
13331329
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/constants.fidl
@@ -1417,7 +1413,6 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/usage_reporter.fidl
14171413
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediacodec/meta.json
14181414
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/meta.json
14191415
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/range.fidl
1420-
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.memorypressure/meta.json
14211416
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.migration/meta.json
14221417
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.migration/migration.fidl
14231418
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular.auth/meta.json
@@ -1497,6 +1492,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/meta.json
14971492
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/pointer_capture.fidl
14981493
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.types/meta.json
14991494
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.types/types.fidl
1495+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.vectorial/meta.json
15001496
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/focuser.fidl
15011497
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/meta.json
15021498
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/view.fidl
@@ -2150,7 +2146,6 @@ FILE: ../../../fuchsia/sdk/linux/device/qemu-x64.json
21502146
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/meta.json
21512147
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth.oldtokens/meta.json
21522148
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/meta.json
2153-
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.a2dp/meta.json
21542149
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.control/meta.json
21552150
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/meta.json
21562151
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/meta.json
@@ -2189,7 +2184,6 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sounds/meta.json
21892184
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/meta.json
21902185
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediacodec/meta.json
21912186
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/meta.json
2192-
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.memorypressure/meta.json
21932187
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.migration/meta.json
21942188
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular.auth/meta.json
21952189
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular.session/meta.json
@@ -2223,6 +2217,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.lifecycle/meta.json
22232217
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/meta.json
22242218
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/meta.json
22252219
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.types/meta.json
2220+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.vectorial/meta.json
22262221
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/meta.json
22272222
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.channel/meta.json
22282223
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.channelcontrol/meta.json
@@ -2493,7 +2488,13 @@ LIBRARY: fuchsia_sdk
24932488
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/null.h
24942489
TYPE: LicenseType.mit
24952490
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/null.h
2491+
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/multiboot.h
2492+
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/scheduler.h
2493+
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/time.h
24962494
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/null.h
2495+
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/multiboot.h
2496+
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/scheduler.h
2497+
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/time.h
24972498
----------------------------------------------------------------------------------------------------
24982499
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
24992500

@@ -2516,7 +2517,6 @@ FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/usb/dfu.h
25162517
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/limits.h
25172518
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/smc.h
25182519
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/threads.h
2519-
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/time.h
25202520
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/driver-config.h
25212521
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/image.h
25222522
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/sysconfig.h
@@ -2527,7 +2527,6 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/usb/dfu.h
25272527
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/limits.h
25282528
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/smc.h
25292529
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/threads.h
2530-
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/time.h
25312530
FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/codec.dart
25322531
FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/enum.dart
25332532
FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/error.dart
@@ -2661,6 +2660,8 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/events.fidl
26612660
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/scenic.fidl
26622661
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/session.fidl
26632662
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/snapshot.fidl
2663+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.vectorial/commands.fidl
2664+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.vectorial/events.fidl
26642665
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/commands.fidl
26652666
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/wlan_common.fidl
26662667
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.stats/wlan_stats.fidl
@@ -3008,43 +3009,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
30083009
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30093010
====================================================================================================
30103011

3011-
====================================================================================================
3012-
LIBRARY: fuchsia_sdk
3013-
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/multiboot.h + ../../../fuchsia/sdk/linux/LICENSE
3014-
TYPE: LicenseType.bsd
3015-
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/multiboot.h
3016-
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/multiboot.h
3017-
----------------------------------------------------------------------------------------------------
3018-
Copyright 2016 The Fuchsia Authors. All rights reserved.
3019-
Copyright (c) 2009 Corey Tabaka
3020-
3021-
Redistribution and use in source and binary forms, with or without
3022-
modification, are permitted provided that the following conditions are
3023-
met:
3024-
3025-
* Redistributions of source code must retain the above copyright
3026-
notice, this list of conditions and the following disclaimer.
3027-
* Redistributions in binary form must reproduce the above
3028-
copyright notice, this list of conditions and the following disclaimer
3029-
in the documentation and/or other materials provided with the
3030-
distribution.
3031-
* Neither the name of Google Inc. nor the names of its
3032-
contributors may be used to endorse or promote products derived from
3033-
this software without specific prior written permission.
3034-
3035-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
3036-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
3037-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
3038-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
3039-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
3040-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
3041-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
3042-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
3043-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3044-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3045-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3046-
====================================================================================================
3047-
30483012
====================================================================================================
30493013
LIBRARY: fuchsia_sdk
30503014
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/vdso/stream.fidl + ../../../fuchsia/sdk/linux/LICENSE
@@ -3053,13 +3017,11 @@ FILE: ../../../fuchsia/sdk/linux/arch/arm64/vdso/stream.fidl
30533017
FILE: ../../../fuchsia/sdk/linux/arch/x64/vdso/stream.fidl
30543018
FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/power.dart
30553019
FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/update.dart
3056-
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.a2dp/audio_mode.fidl
30573020
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/connection_options.fidl
30583021
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/device.fidl
30593022
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/device_watcher.fidl
30603023
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/stream.fidl
30613024
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsetup/server.fidl
3062-
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.memorypressure/memorypressure.fidl
30633025
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/night_mode.fidl
30643026
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.url/url.fidl
30653027
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/stream.h
@@ -3424,4 +3386,4 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
34243386
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
34253387
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34263388
====================================================================================================
3427-
Total license count: 14
3389+
Total license count: 13

‎sky/packages/sky_engine/LICENSE‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5113,37 +5113,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
51135113
--------------------------------------------------------------------------------
51145114
fuchsia_sdk
51155115

5116-
Copyright 2016 The Fuchsia Authors. All rights reserved.
5117-
Copyright (c) 2009 Corey Tabaka
5118-
5119-
Redistribution and use in source and binary forms, with or without
5120-
modification, are permitted provided that the following conditions are
5121-
met:
5122-
5123-
* Redistributions of source code must retain the above copyright
5124-
notice, this list of conditions and the following disclaimer.
5125-
* Redistributions in binary form must reproduce the above
5126-
copyright notice, this list of conditions and the following disclaimer
5127-
in the documentation and/or other materials provided with the
5128-
distribution.
5129-
* Neither the name of Google Inc. nor the names of its
5130-
contributors may be used to endorse or promote products derived from
5131-
this software without specific prior written permission.
5132-
5133-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5134-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5135-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5136-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5137-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5138-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5139-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5140-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5141-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5142-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5143-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5144-
--------------------------------------------------------------------------------
5145-
fuchsia_sdk
5146-
51475116
Copyright 2020 The Fuchsia Authors. All rights reserved.
51485117

51495118
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)