From df5036eb6e738c723339ed74c1e8ca93bea2570d Mon Sep 17 00:00:00 2001 From: Ryan Macnak Date: Wed, 4 Mar 2020 18:56:16 +0000 Subject: [PATCH] [vm] Require only an isolate group, not an isolate, in Dart_Delete[Weak]PersistentHandle. Remove the now-misleading isolate parameter of Dart_DeleteWeakPersistentHandle. Bug: https://github.com/dart-lang/sdk/issues/40836 Change-Id: I784f1ecf564484b59f60ebef53ddb975aff1bd23 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/138015 Commit-Queue: Ryan Macnak Reviewed-by: Alexander Aprelev Reviewed-by: Martin Kustermann --- runtime/bin/file.h | 2 +- runtime/include/dart_api.h | 27 +- runtime/vm/dart_api_impl.cc | 32 +- runtime/vm/dart_api_impl.h | 15 + runtime/vm/dart_api_impl_test.cc | 133 +- runtime/vm/handles_test.cc | 2 - runtime/vm/heap/heap.cc | 18 - runtime/vm/heap/heap.h | 14 - runtime/vm/heap/marker.cc | 3 - runtime/vm/heap/scavenger.cc | 1 - runtime/vm/isolate.h | 1 - runtime/vm/object_graph_test.cc | 3 +- runtime/vm/service_test.cc | 3 +- runtime/vm/thread.h | 1 - ...903f3e78ab6eb1d7d5ed1a70a039b3646913.patch | 13 - ...d7ad3a33b7c4d42067c1a24c9279c321071f.patch | 221 --- ...d65d4ab6cb8b79562d83550d5e37f33abb50.patch | 39 - ...3be10d35d994641da167cc806f20a7ffa679.patch | 232 --- ...ea9cad4b014f88d2f1be1b321db493725a1c.patch | 622 -------- ...3f0326bc15ad938319cbbb151f183d064609.patch | 13 - ...f7e2eb8ac44b6de3e87a3062d1c8e34b6cc1.patch | 330 ----- ...775db81ef2a389d5aee6236176362b082d58.patch | 613 -------- ...8b1d1c9050734c0491f4e36b7d61ef005233.patch | 16 - ...ea7ba9124fd42a34c1d021232113e20d21b1.patch | 1305 ----------------- ...5599cb1a74ff88d7d00a33f25029e42df757.patch | 32 + ...9c358e24f71b865d5f720c0c1c8456a53bad.patch | 1305 ----------------- 26 files changed, 161 insertions(+), 4835 deletions(-) delete mode 100644 tools/patches/flutter-engine/0299903f3e78ab6eb1d7d5ed1a70a039b3646913.patch delete mode 100644 tools/patches/flutter-engine/06c3d7ad3a33b7c4d42067c1a24c9279c321071f.patch delete mode 100644 tools/patches/flutter-engine/1e43d65d4ab6cb8b79562d83550d5e37f33abb50.patch delete mode 100644 tools/patches/flutter-engine/67ab3be10d35d994641da167cc806f20a7ffa679.patch delete mode 100644 tools/patches/flutter-engine/6a65ea9cad4b014f88d2f1be1b321db493725a1c.patch delete mode 100644 tools/patches/flutter-engine/6e2b3f0326bc15ad938319cbbb151f183d064609.patch delete mode 100644 tools/patches/flutter-engine/8ba6f7e2eb8ac44b6de3e87a3062d1c8e34b6cc1.patch delete mode 100644 tools/patches/flutter-engine/a61c775db81ef2a389d5aee6236176362b082d58.patch delete mode 100644 tools/patches/flutter-engine/b48c8b1d1c9050734c0491f4e36b7d61ef005233.patch delete mode 100644 tools/patches/flutter-engine/cb80ea7ba9124fd42a34c1d021232113e20d21b1.patch create mode 100644 tools/patches/flutter-engine/e7e45599cb1a74ff88d7d00a33f25029e42df757.patch delete mode 100644 tools/patches/flutter-engine/ea969c358e24f71b865d5f720c0c1c8456a53bad.patch diff --git a/runtime/bin/file.h b/runtime/bin/file.h index 2716d41328e..ac8968889d4 100644 --- a/runtime/bin/file.h +++ b/runtime/bin/file.h @@ -196,7 +196,7 @@ class File : public ReferenceCounted { // when the file is explicitly closed and the finalizer is no longer // needed. void DeleteWeakHandle(Dart_Isolate isolate) { - Dart_DeleteWeakPersistentHandle(isolate, weak_handle_); + Dart_DeleteWeakPersistentHandle(weak_handle_); weak_handle_ = NULL; } diff --git a/runtime/include/dart_api.h b/runtime/include/dart_api.h index eef0f094eea..0da49b069cb 100644 --- a/runtime/include/dart_api.h +++ b/runtime/include/dart_api.h @@ -79,6 +79,7 @@ * set by any call to Dart_CreateIsolateGroup or Dart_EnterIsolate. */ typedef struct _Dart_Isolate* Dart_Isolate; +typedef struct _Dart_IsolateGroup* Dart_IsolateGroup; /** * An object reference managed by the Dart VM garbage collector. @@ -441,8 +442,6 @@ DART_EXPORT void Dart_SetPersistentHandle(Dart_PersistentHandle obj1, /** * Deallocates a persistent handle. - * - * Requires there to be a current isolate. */ DART_EXPORT void Dart_DeletePersistentHandle(Dart_PersistentHandle object); @@ -456,13 +455,16 @@ DART_EXPORT void Dart_DeletePersistentHandle(Dart_PersistentHandle object); * calling Dart_DeleteWeakPersistentHandle. * * If the object becomes unreachable the callback is invoked with the weak - * persistent handle and the peer as arguments. The callback is invoked on the - * thread that has entered the isolate at the time of garbage collection. This - * gives the embedder the ability to cleanup data associated with the object and - * clear out any cached references to the handle. All references to this handle - * after the callback will be invalid. It is illegal to call into the VM from - * the callback. If the handle is deleted before the object becomes unreachable, - * the callback is never invoked. + * persistent handle and the peer as arguments. The callback can be executed + * on any thread, will not have a current isolate, and can only call + * Dart_DeletePersistentHandle or Dart_DeleteWeakPersistentHandle. The callback + * must not call Dart_DeleteWeakPersistentHandle for the handle being finalized, + * as it is automatically deleted by the VM after the callback returns. + * This gives the embedder the ability to cleanup data associated with the + * object and clear out any cached references to the handle. All references to + * this handle after the callback will be invalid. It is illegal to call into + * the VM from the callback. If the handle is deleted before the object becomes + * unreachable, the callback is never invoked. * * Requires there to be a current isolate. * @@ -485,7 +487,6 @@ Dart_NewWeakPersistentHandle(Dart_Handle object, Dart_WeakPersistentHandleFinalizer callback); DART_EXPORT void Dart_DeleteWeakPersistentHandle( - Dart_Isolate isolate, Dart_WeakPersistentHandle object); /* @@ -991,6 +992,12 @@ DART_EXPORT void* Dart_CurrentIsolateData(); */ DART_EXPORT void* Dart_IsolateData(Dart_Isolate isolate); +/** + * Returns the current isolate group. Will return NULL if there is no + * current isolate group. + */ +DART_EXPORT Dart_IsolateGroup Dart_CurrentIsolateGroup(); + /** * Returns the callback data associated with the current isolate group. This * data was passed to the isolate group when it was created. diff --git a/runtime/vm/dart_api_impl.cc b/runtime/vm/dart_api_impl.cc index 3ee28fdafba..5698a8b607e 100644 --- a/runtime/vm/dart_api_impl.cc +++ b/runtime/vm/dart_api_impl.cc @@ -430,6 +430,10 @@ Dart_Isolate Api::CastIsolate(Isolate* isolate) { return reinterpret_cast(isolate); } +Dart_IsolateGroup Api::CastIsolateGroup(IsolateGroup* isolate_group) { + return reinterpret_cast(isolate_group); +} + Dart_Handle Api::NewError(const char* format, ...) { Thread* T = Thread::Current(); CHECK_API_SCOPE(T); @@ -994,11 +998,12 @@ Dart_NewWeakPersistentHandle(Dart_Handle object, } DART_EXPORT void Dart_DeletePersistentHandle(Dart_PersistentHandle object) { - Isolate* isolate = Isolate::Current(); - CHECK_ISOLATE(isolate); + IsolateGroup* isolate_group = IsolateGroup::Current(); + CHECK_ISOLATE_GROUP(isolate_group); NoSafepointScope no_safepoint_scope; - ApiState* state = isolate->group()->api_state(); + ApiState* state = isolate_group->api_state(); ASSERT(state != NULL); + ASSERT(state->IsActivePersistentHandle(object)); PersistentHandle* ref = PersistentHandle::Cast(object); ASSERT(!state->IsProtectedHandle(ref)); if (!state->IsProtectedHandle(ref)) { @@ -1007,16 +1012,15 @@ DART_EXPORT void Dart_DeletePersistentHandle(Dart_PersistentHandle object) { } DART_EXPORT void Dart_DeleteWeakPersistentHandle( - Dart_Isolate current_isolate, Dart_WeakPersistentHandle object) { - Isolate* isolate = reinterpret_cast(current_isolate); - CHECK_ISOLATE(isolate); + IsolateGroup* isolate_group = IsolateGroup::Current(); + CHECK_ISOLATE_GROUP(isolate_group); NoSafepointScope no_safepoint_scope; - ASSERT(isolate == Isolate::Current()); - ApiState* state = isolate->group()->api_state(); + ApiState* state = isolate_group->api_state(); ASSERT(state != NULL); + ASSERT(state->IsActiveWeakPersistentHandle(object)); auto weak_ref = FinalizablePersistentHandle::Cast(object); - weak_ref->EnsureFreeExternal(isolate->group()); + weak_ref->EnsureFreeExternal(isolate_group); state->FreeWeakPersistentHandle(weak_ref); } @@ -1469,11 +1473,15 @@ DART_EXPORT void* Dart_IsolateData(Dart_Isolate isolate) { return reinterpret_cast(isolate)->init_callback_data(); } +DART_EXPORT Dart_IsolateGroup Dart_CurrentIsolateGroup() { + return Api::CastIsolateGroup(IsolateGroup::Current()); +} + DART_EXPORT void* Dart_CurrentIsolateGroupData() { - Isolate* isolate = Isolate::Current(); - CHECK_ISOLATE(isolate); + IsolateGroup* isolate_group = IsolateGroup::Current(); + CHECK_ISOLATE_GROUP(isolate_group); NoSafepointScope no_safepoint_scope; - return isolate->group()->embedder_data(); + return isolate_group->embedder_data(); } DART_EXPORT void* Dart_IsolateGroupData(Dart_Isolate isolate) { diff --git a/runtime/vm/dart_api_impl.h b/runtime/vm/dart_api_impl.h index b9221a3acc9..65ed764f720 100644 --- a/runtime/vm/dart_api_impl.h +++ b/runtime/vm/dart_api_impl.h @@ -28,6 +28,17 @@ const char* CanonicalFunction(const char* func); #define CURRENT_FUNC CanonicalFunction(__FUNCTION__) +// Checks that the current isolate group is not NULL. +#define CHECK_ISOLATE_GROUP(isolate_group) \ + do { \ + if ((isolate_group) == NULL) { \ + FATAL1( \ + "%s expects there to be a current isolate group. Did you " \ + "forget to call Dart_CreateIsolateGroup or Dart_EnterIsolate?", \ + CURRENT_FUNC); \ + } \ + } while (0) + // Checks that the current isolate is not NULL. #define CHECK_ISOLATE(isolate) \ do { \ @@ -173,6 +184,10 @@ class Api : AllStatic { // Casts the internal Isolate* type to the external Dart_Isolate type. static Dart_Isolate CastIsolate(Isolate* isolate); + // Casts the internal IsolateGroup* type to the external Dart_IsolateGroup + // type. + static Dart_IsolateGroup CastIsolateGroup(IsolateGroup* isolate); + // Gets the handle used to designate successful return. static Dart_Handle Success() { return Api::True(); } diff --git a/runtime/vm/dart_api_impl_test.cc b/runtime/vm/dart_api_impl_test.cc index 0bcdb741878..a756343c8cb 100644 --- a/runtime/vm/dart_api_impl_test.cc +++ b/runtime/vm/dart_api_impl_test.cc @@ -3234,6 +3234,52 @@ TEST_CASE(DartAPI_WeakPersistentHandleErrors) { Dart_ExitScope(); } +static Dart_PersistentHandle persistent_handle1; +static Dart_WeakPersistentHandle weak_persistent_handle2; +static Dart_WeakPersistentHandle weak_persistent_handle3; + +static void WeakPersistentHandlePeerCleanupFinalizer( + void* isolate_callback_data, + Dart_WeakPersistentHandle handle, + void* peer) { + Dart_DeletePersistentHandle(persistent_handle1); + Dart_DeleteWeakPersistentHandle(weak_persistent_handle2); + *static_cast(peer) = 42; +} + +static void WeakPersistentHandleNoopCallback(void* isolate_callback_data, + Dart_WeakPersistentHandle handle, + void* peer) {} + +TEST_CASE(DartAPI_WeakPersistentHandleCleanupFinalizer) { + Heap* heap = Isolate::Current()->heap(); + + const char* kTestString1 = "Test String1"; + Dart_EnterScope(); + CHECK_API_SCOPE(thread); + Dart_Handle ref1 = Dart_NewStringFromCString(kTestString1); + persistent_handle1 = Dart_NewPersistentHandle(ref1); + Dart_Handle ref2 = Dart_NewStringFromCString(kTestString1); + int peer2 = 0; + weak_persistent_handle2 = Dart_NewWeakPersistentHandle( + ref2, &peer2, 0, WeakPersistentHandleNoopCallback); + int peer3 = 0; + { + Dart_EnterScope(); + Dart_Handle ref3 = Dart_NewStringFromCString(kTestString1); + weak_persistent_handle3 = Dart_NewWeakPersistentHandle( + ref3, &peer3, 0, WeakPersistentHandlePeerCleanupFinalizer); + Dart_ExitScope(); + } + { + TransitionNativeToVM transition(thread); + GCTestHelper::CollectAllGarbage(); + EXPECT(heap->ExternalInWords(Heap::kOld) == 0); + EXPECT(peer3 == 42); + } + Dart_ExitScope(); +} + static void WeakPersistentHandlePeerFinalizer(void* isolate_callback_data, Dart_WeakPersistentHandle handle, void* peer) { @@ -3275,8 +3321,7 @@ TEST_CASE(DartAPI_WeakPersistentHandleNoCallback) { } // A finalizer is not invoked on a deleted handle. Therefore, the // peer value should not change after the referent is collected. - Dart_Isolate isolate = reinterpret_cast(Isolate::Current()); - Dart_DeleteWeakPersistentHandle(isolate, weak_ref); + Dart_DeleteWeakPersistentHandle(weak_ref); EXPECT(peer == 0); { TransitionNativeToVM transition(thread); @@ -3338,9 +3383,6 @@ TEST_CASE(DartAPI_WeakPersistentHandleExternalAllocationSize) { EXPECT(heap->ExternalInWords(Heap::kNew) == 0); EXPECT(heap->ExternalInWords(Heap::kOld) == kWeak2ExternalSize / kWordSize); } - Dart_Isolate isolate = reinterpret_cast(Isolate::Current()); - Dart_DeleteWeakPersistentHandle(isolate, weak1); - Dart_DeleteWeakPersistentHandle(isolate, weak2); Dart_DeletePersistentHandle(strong_ref); { TransitionNativeToVM transition(thread); @@ -3350,7 +3392,6 @@ TEST_CASE(DartAPI_WeakPersistentHandleExternalAllocationSize) { } TEST_CASE(DartAPI_WeakPersistentHandleExternalAllocationSizeNewspaceGC) { - Dart_Isolate isolate = reinterpret_cast(Isolate::Current()); Heap* heap = Isolate::Current()->heap(); Dart_WeakPersistentHandle weak1 = NULL; // Large enough to exceed any new space limit. Not actually allocated. @@ -3369,7 +3410,7 @@ TEST_CASE(DartAPI_WeakPersistentHandleExternalAllocationSizeNewspaceGC) { Dart_WeakPersistentHandle trigger = Dart_NewWeakPersistentHandle(obj, NULL, 1, NopCallback); EXPECT_VALID(AsHandle(trigger)); - Dart_DeleteWeakPersistentHandle(isolate, trigger); + Dart_DeleteWeakPersistentHandle(trigger); // After the two scavenges above, 'obj' should now be promoted, hence its // external size charged to old space. { @@ -3384,7 +3425,7 @@ TEST_CASE(DartAPI_WeakPersistentHandleExternalAllocationSizeNewspaceGC) { EXPECT(heap->ExternalInWords(Heap::kOld) == kWeak1ExternalSize / kWordSize); Dart_ExitScope(); } - Dart_DeleteWeakPersistentHandle(isolate, weak1); + Dart_DeleteWeakPersistentHandle(weak1); { TransitionNativeToVM transition(thread); GCTestHelper::CollectOldSpace(); @@ -3457,9 +3498,8 @@ TEST_CASE(DartAPI_WeakPersistentHandleExternalAllocationSizeOddReferents) { (kWeak1ExternalSize + kWeak2ExternalSize) / kWordSize); Dart_ExitScope(); } - Dart_Isolate isolate = reinterpret_cast(Isolate::Current()); - Dart_DeleteWeakPersistentHandle(isolate, weak1); - Dart_DeleteWeakPersistentHandle(isolate, weak2); + Dart_DeleteWeakPersistentHandle(weak1); + Dart_DeleteWeakPersistentHandle(weak2); EXPECT_EQ(0, heap->ExternalInWords(Heap::kOld)); { TransitionNativeToVM transition(thread); @@ -3468,50 +3508,6 @@ TEST_CASE(DartAPI_WeakPersistentHandleExternalAllocationSizeOddReferents) { } } -static void AssertingFinalizer(void* isolate_callback_data, - Dart_WeakPersistentHandle handle, - void* peer) { - Dart_Isolate expected_isolate = reinterpret_cast(peer); - EXPECT_EQ(expected_isolate, Dart_CurrentIsolate()); -} - -// TODO(https://github.com/dart-lang/sdk/issues/40836): Remove. -TEST_CASE(DartAPI_WeakPersistentHandleFinalizerCurrentIsolate) { - { - Dart_EnterScope(); - - Dart_Handle obj = AllocateNewString("ABC"); - void* peer = Dart_CurrentIsolate(); - EXPECT_NOTNULL(peer); - intptr_t external_size = 0; - Dart_NewWeakPersistentHandle(obj, peer, external_size, AssertingFinalizer); - - Dart_ExitScope(); - } - - { - TransitionNativeToVM transition(thread); - GCTestHelper::CollectAllGarbage(); - } - - { - Dart_EnterScope(); - - Dart_Handle obj = AllocateOldString("ABC"); - void* peer = Dart_CurrentIsolate(); - EXPECT_NOTNULL(peer); - intptr_t external_size = 0; - Dart_NewWeakPersistentHandle(obj, peer, external_size, AssertingFinalizer); - - Dart_ExitScope(); - } - - { - TransitionNativeToVM transition(thread); - GCTestHelper::CollectAllGarbage(); - } -} - static Dart_WeakPersistentHandle weak1 = NULL; static Dart_WeakPersistentHandle weak2 = NULL; static Dart_WeakPersistentHandle weak3 = NULL; @@ -3778,19 +3774,38 @@ VM_UNIT_TEST_CASE(DartAPI_Isolates) { Dart_Isolate isolate = Dart_CurrentIsolate(); EXPECT_EQ(iso_1, isolate); Dart_ExitIsolate(); - EXPECT(NULL == Dart_CurrentIsolate()); + EXPECT_NULLPTR(Dart_CurrentIsolate()); Dart_Isolate iso_2 = TestCase::CreateTestIsolate(); EXPECT_EQ(iso_2, Dart_CurrentIsolate()); Dart_ExitIsolate(); - EXPECT(NULL == Dart_CurrentIsolate()); + EXPECT_NULLPTR(Dart_CurrentIsolate()); Dart_EnterIsolate(iso_2); EXPECT_EQ(iso_2, Dart_CurrentIsolate()); Dart_ShutdownIsolate(); - EXPECT(NULL == Dart_CurrentIsolate()); + EXPECT_NULLPTR(Dart_CurrentIsolate()); Dart_EnterIsolate(iso_1); EXPECT_EQ(iso_1, Dart_CurrentIsolate()); Dart_ShutdownIsolate(); - EXPECT(NULL == Dart_CurrentIsolate()); + EXPECT_NULLPTR(Dart_CurrentIsolate()); +} + +VM_UNIT_TEST_CASE(DartAPI_IsolateGroups) { + Dart_Isolate iso_1 = TestCase::CreateTestIsolate(); + EXPECT_NOTNULL(Dart_CurrentIsolateGroup()); + Dart_ExitIsolate(); + EXPECT_NULLPTR(Dart_CurrentIsolateGroup()); + Dart_Isolate iso_2 = TestCase::CreateTestIsolate(); + EXPECT_NOTNULL(Dart_CurrentIsolateGroup()); + Dart_ExitIsolate(); + EXPECT_NULLPTR(Dart_CurrentIsolateGroup()); + Dart_EnterIsolate(iso_2); + EXPECT_NOTNULL(Dart_CurrentIsolateGroup()); + Dart_ShutdownIsolate(); + EXPECT_NULLPTR(Dart_CurrentIsolateGroup()); + Dart_EnterIsolate(iso_1); + EXPECT_NOTNULL(Dart_CurrentIsolateGroup()); + Dart_ShutdownIsolate(); + EXPECT_NULLPTR(Dart_CurrentIsolateGroup()); } VM_UNIT_TEST_CASE(DartAPI_CurrentIsolateData) { diff --git a/runtime/vm/handles_test.cc b/runtime/vm/handles_test.cc index 142e147ea35..0e6486f4c79 100644 --- a/runtime/vm/handles_test.cc +++ b/runtime/vm/handles_test.cc @@ -116,7 +116,6 @@ TEST_CASE(CheckHandleValidity) { EXPECT(!Api::IsValid(handle)); // Check validity using persistent handle. - Isolate* isolate = Isolate::Current(); Dart_Handle scoped_handle; { TransitionNativeToVM transition(thread); @@ -137,7 +136,6 @@ TEST_CASE(CheckHandleValidity) { EXPECT_VALID(handle); Dart_DeleteWeakPersistentHandle( - reinterpret_cast(isolate), reinterpret_cast(handle)); EXPECT(!Api::IsValid(handle)); } diff --git a/runtime/vm/heap/heap.cc b/runtime/vm/heap/heap.cc index a04108bc3d9..59abade1279 100644 --- a/runtime/vm/heap/heap.cc +++ b/runtime/vm/heap/heap.cc @@ -52,24 +52,6 @@ class NoActiveIsolateScope { Isolate* saved_isolate_; }; -RunFinalizersScope::RunFinalizersScope(Thread* thread) : thread_(thread) { - if (!FLAG_enable_isolate_groups) { - ASSERT(thread->IsAtSafepoint() || - (thread->task_kind() == Thread::kMarkerTask)); - IsolateGroup* isolate_group = thread->isolate_group(); - Isolate* isolate = isolate_group->isolates_.First(); - ASSERT(isolate == isolate_group->isolates_.Last()); - saved_isolate_ = thread->isolate_; - thread->isolate_ = isolate; - } -} - -RunFinalizersScope::~RunFinalizersScope() { - if (!FLAG_enable_isolate_groups) { - thread_->isolate_ = saved_isolate_; - } -} - Heap::Heap(IsolateGroup* isolate_group, intptr_t max_new_gen_semi_words, intptr_t max_old_gen_words) diff --git a/runtime/vm/heap/heap.h b/runtime/vm/heap/heap.h index f72472ef9cb..34ab784564f 100644 --- a/runtime/vm/heap/heap.h +++ b/runtime/vm/heap/heap.h @@ -30,20 +30,6 @@ class ServiceEvent; class TimelineEventScope; class VirtualMemory; -// Temporarily enter the only isolate in the group before running weak handle -// finalizers to keep existing embedder code working. Remove once embedders -// are updated to think in terms of isolate groups. -// TODO(https://github.com/dart-lang/sdk/issues/40836): Remove. -class RunFinalizersScope { - public: - explicit RunFinalizersScope(Thread* thread); - ~RunFinalizersScope(); - - private: - Thread* thread_; - Isolate* saved_isolate_; -}; - class Heap { public: enum Space { diff --git a/runtime/vm/heap/marker.cc b/runtime/vm/heap/marker.cc index 75bc357953c..d35329637f0 100644 --- a/runtime/vm/heap/marker.cc +++ b/runtime/vm/heap/marker.cc @@ -465,12 +465,9 @@ void GCMarker::IterateWeakRoots(Thread* thread) { void GCMarker::ProcessWeakHandles(Thread* thread) { TIMELINE_FUNCTION_GC_DURATION(thread, "ProcessWeakHandles"); - MarkingWeakVisitor visitor(thread); ApiState* state = isolate_group_->api_state(); ASSERT(state != NULL); - - RunFinalizersScope tcis(thread); isolate_group_->VisitWeakPersistentHandles(&visitor); } diff --git a/runtime/vm/heap/scavenger.cc b/runtime/vm/heap/scavenger.cc index f1d4b2a57c5..d3c20b2865a 100644 --- a/runtime/vm/heap/scavenger.cc +++ b/runtime/vm/heap/scavenger.cc @@ -772,7 +772,6 @@ bool Scavenger::IsUnreachable(RawObject** p) { void Scavenger::IterateWeakRoots(IsolateGroup* isolate_group, HandleVisitor* visitor) { - RunFinalizersScope tcis(Thread::Current()); isolate_group->VisitWeakPersistentHandles(visitor); } diff --git a/runtime/vm/isolate.h b/runtime/vm/isolate.h index f2389bb26c6..0bc9b3a1066 100644 --- a/runtime/vm/isolate.h +++ b/runtime/vm/isolate.h @@ -476,7 +476,6 @@ class IsolateGroup : public IntrusiveDListEntry { private: friend class Heap; friend class StackFrame; // For `[isolates_].First()`. - friend class RunFinalizersScope; // For `[isolates_].First()`. #define ISOLATE_GROUP_FLAG_BITS(V) V(CompactionInProgress) diff --git a/runtime/vm/object_graph_test.cc b/runtime/vm/object_graph_test.cc index c5b6f678e42..b371eb60fab 100644 --- a/runtime/vm/object_graph_test.cc +++ b/runtime/vm/object_graph_test.cc @@ -186,8 +186,7 @@ ISOLATE_UNIT_TEST_CASE(RetainingPathGCRoot) { // Delete the weak persistent handle. GC root should now be local handle. { TransitionVMToNative transition(thread); - Dart_DeleteWeakPersistentHandle(Api::CastIsolate(thread->isolate()), - weak_persistent_handle); + Dart_DeleteWeakPersistentHandle(weak_persistent_handle); weak_persistent_handle = NULL; } result = graph.RetainingPath(&path, path); diff --git a/runtime/vm/service_test.cc b/runtime/vm/service_test.cc index 7ba614a8e07..47f60603ef0 100644 --- a/runtime/vm/service_test.cc +++ b/runtime/vm/service_test.cc @@ -547,8 +547,7 @@ ISOLATE_UNIT_TEST_CASE(Service_PersistentHandles) { { TransitionVMToNative transition(thread); Dart_DeletePersistentHandle(persistent_handle); - Dart_DeleteWeakPersistentHandle(Dart_CurrentIsolate(), - weak_persistent_handle); + Dart_DeleteWeakPersistentHandle(weak_persistent_handle); } // Get persistent handles (again). diff --git a/runtime/vm/thread.h b/runtime/vm/thread.h index 70fde6825f1..cf563c43198 100644 --- a/runtime/vm/thread.h +++ b/runtime/vm/thread.h @@ -1036,7 +1036,6 @@ class Thread : public ThreadState { friend Isolate* CreateWithinExistingIsolateGroup(IsolateGroup*, const char*, char**); - friend class RunFinalizersScope; DISALLOW_COPY_AND_ASSIGN(Thread); }; diff --git a/tools/patches/flutter-engine/0299903f3e78ab6eb1d7d5ed1a70a039b3646913.patch b/tools/patches/flutter-engine/0299903f3e78ab6eb1d7d5ed1a70a039b3646913.patch deleted file mode 100644 index d7249cf1c86..00000000000 --- a/tools/patches/flutter-engine/0299903f3e78ab6eb1d7d5ed1a70a039b3646913.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/DEPS b/DEPS -index f2b3cc9..88557e8 100644 ---- a/DEPS -+++ b/DEPS -@@ -72,6 +72,6 @@ vars = { - 'dart_oauth2_tag': '1.2.1', - 'dart_observatory_pub_packages_rev': '0894122173b0f98eb08863a7712e78407d4477bc', -- 'dart_package_config_tag': '2453cd2e78c2db56ee2669ced17ce70dd00bf576', -+ 'dart_package_config_tag': '3401e2897b3cf46e64966e2ba19ed7032501cf41', - 'dart_package_resolver_tag': '1.0.10', - 'dart_path_tag': '1.6.2', - 'dart_pedantic_tag': 'v1.8.0', - diff --git a/tools/patches/flutter-engine/06c3d7ad3a33b7c4d42067c1a24c9279c321071f.patch b/tools/patches/flutter-engine/06c3d7ad3a33b7c4d42067c1a24c9279c321071f.patch deleted file mode 100644 index 3e479090884..00000000000 --- a/tools/patches/flutter-engine/06c3d7ad3a33b7c4d42067c1a24c9279c321071f.patch +++ /dev/null @@ -1,221 +0,0 @@ -diff --git a/runtime/dart_isolate.cc b/runtime/dart_isolate.cc -index 96ac6facd..b649ca834 100644 ---- a/runtime/dart_isolate.cc -+++ b/runtime/dart_isolate.cc -@@ -163,7 +163,7 @@ bool DartIsolate::Initialize(Dart_Isolate dart_isolate, bool is_root_isolate) { - } - - auto* isolate_data = static_cast*>( -- Dart_IsolateData(dart_isolate)); -+ Dart_IsolateGroupData(dart_isolate)); - if (isolate_data->get() != this) { - return false; - } -@@ -174,7 +174,7 @@ bool DartIsolate::Initialize(Dart_Isolate dart_isolate, bool is_root_isolate) { - // We are entering a new scope (for the first time since initialization) and - // we want to restore the current scope to null when we exit out of this - // method. This balances the implicit Dart_EnterIsolate call made by -- // Dart_CreateIsolate (which calls the Initialize). -+ // Dart_CreateIsolateGroup (which calls the Initialize). - Dart_ExitIsolate(); - - tonic::DartIsolateScope scope(isolate()); -@@ -636,8 +636,8 @@ Dart_Isolate DartIsolate::DartCreateAndStartServiceIsolate( - return service_isolate->isolate(); - } - --// |Dart_IsolateCreateCallback| --Dart_Isolate DartIsolate::DartIsolateCreateCallback( -+// |Dart_IsolateGroupCreateCallback| -+Dart_Isolate DartIsolate::DartIsolateGroupCreateCallback( - const char* advisory_script_uri, - const char* advisory_script_entrypoint, - const char* package_root, -@@ -720,14 +720,16 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair( - } - - // Create the Dart VM isolate and give it the embedder object as the baton. -- Dart_Isolate isolate = Dart_CreateIsolate( -+ Dart_Isolate isolate = Dart_CreateIsolateGroup( - advisory_script_uri, // - advisory_script_entrypoint, // - (*embedder_isolate)->GetIsolateSnapshot()->GetDataMapping(), - (*embedder_isolate)->GetIsolateSnapshot()->GetInstructionsMapping(), - (*embedder_isolate)->GetSharedSnapshot()->GetDataMapping(), - (*embedder_isolate)->GetSharedSnapshot()->GetInstructionsMapping(), flags, -- embedder_isolate.get(), error); -+ embedder_isolate.get(), // isolate_group_data -+ embedder_isolate.get(), // isolate_data -+ error); - - if (isolate == nullptr) { - FML_DLOG(ERROR) << *error; -@@ -775,10 +777,10 @@ void DartIsolate::DartIsolateShutdownCallback( - isolate_group_data->get()->OnShutdownCallback(); - } - --// |Dart_IsolateCleanupCallback| --void DartIsolate::DartIsolateCleanupCallback( -- std::shared_ptr* isolate_data) { -- delete isolate_data; -+// |Dart_IsolateGroupCleanupCallback| -+void DartIsolate::DartIsolateGroupCleanupCallback( -+ std::shared_ptr* isolate_group_data) { -+ delete isolate_group_data; - } - - fml::RefPtr DartIsolate::GetIsolateSnapshot() const { -diff --git a/runtime/dart_isolate.h b/runtime/dart_isolate.h -index 60412972a..453810b1b 100644 ---- a/runtime/dart_isolate.h -+++ b/runtime/dart_isolate.h -@@ -156,8 +156,8 @@ class DartIsolate : public UIDartState { - - void OnShutdownCallback(); - -- // |Dart_IsolateCreateCallback| -- static Dart_Isolate DartIsolateCreateCallback( -+ // |Dart_IsolateGroupCreateCallback| -+ static Dart_Isolate DartIsolateGroupCreateCallback( - const char* advisory_script_uri, - const char* advisory_script_entrypoint, - const char* package_root, -@@ -189,9 +189,9 @@ class DartIsolate : public UIDartState { - std::shared_ptr* isolate_group_data, - std::shared_ptr* isolate_data); - -- // |Dart_IsolateCleanupCallback| -- static void DartIsolateCleanupCallback( -- std::shared_ptr* embedder_isolate); -+ // |Dart_IsolateGroupCleanupCallback| -+ static void DartIsolateGroupCleanupCallback( -+ std::shared_ptr* isolate_group_data); - - FML_DISALLOW_COPY_AND_ASSIGN(DartIsolate); - }; -diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc -index 903e74b15..555d0c9ee 100644 ---- a/runtime/dart_vm.cc -+++ b/runtime/dart_vm.cc -@@ -366,12 +366,13 @@ DartVM::DartVM(std::shared_ptr vm_data, - params.vm_snapshot_data = vm_data_->GetVMSnapshot().GetDataMapping(); - params.vm_snapshot_instructions = - vm_data_->GetVMSnapshot().GetInstructionsMapping(); -- params.create = reinterpret_cast( -- DartIsolate::DartIsolateCreateCallback); -- params.shutdown = reinterpret_cast( -- DartIsolate::DartIsolateShutdownCallback); -- params.cleanup = reinterpret_cast( -- DartIsolate::DartIsolateCleanupCallback); -+ params.create_group = reinterpret_cast( -+ DartIsolate::DartIsolateGroupCreateCallback); -+ params.shutdown_isolate = -+ reinterpret_cast( -+ DartIsolate::DartIsolateShutdownCallback); -+ params.cleanup_group = reinterpret_cast( -+ DartIsolate::DartIsolateGroupCleanupCallback); - params.thread_exit = ThreadExitCallback; - params.get_service_assets = GetVMServiceAssetsArchiveCallback; - params.entropy_source = dart::bin::GetEntropy; -diff --git a/shell/platform/fuchsia/dart/dart_component_controller.cc b/shell/platform/fuchsia/dart/dart_component_controller.cc -index 1c4f71050..c8e7cc5ab 100644 ---- a/shell/platform/fuchsia/dart/dart_component_controller.cc -+++ b/shell/platform/fuchsia/dart/dart_component_controller.cc -@@ -324,12 +324,13 @@ bool DartComponentController::CreateIsolate( - auto state = new std::shared_ptr(new tonic::DartState( - namespace_fd, [this](Dart_Handle result) { MessageEpilogue(result); })); - -- isolate_ = Dart_CreateIsolate( -+ isolate_ = Dart_CreateIsolateGroup( - url_.c_str(), label_.c_str(), isolate_snapshot_data, - isolate_snapshot_instructions, shared_snapshot_data, -- shared_snapshot_instructions, nullptr /* flags */, state, &error); -+ shared_snapshot_instructions, nullptr /* flags */, -+ state /* isolate_group_data */, state /* isolate_data */, &error); - if (!isolate_) { -- FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolate failed: %s", error); -+ FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolateGroup failed: %s", error); - return false; - } - -diff --git a/shell/platform/fuchsia/dart/dart_runner.cc b/shell/platform/fuchsia/dart/dart_runner.cc -index 200500d2c..b9ded3ac4 100644 ---- a/shell/platform/fuchsia/dart/dart_runner.cc -+++ b/shell/platform/fuchsia/dart/dart_runner.cc -@@ -61,13 +61,13 @@ const char* kDartVMArgs[] = { - // clang-format on - }; - --Dart_Isolate IsolateCreateCallback(const char* uri, -- const char* name, -- const char* package_root, -- const char* package_config, -- Dart_IsolateFlags* flags, -- void* callback_data, -- char** error) { -+Dart_Isolate IsolateGroupCreateCallback(const char* uri, -+ const char* name, -+ const char* package_root, -+ const char* package_config, -+ Dart_IsolateFlags* flags, -+ void* callback_data, -+ char** error) { - if (std::string(uri) == DART_VM_SERVICE_ISOLATE_NAME) { - #if defined(DART_PRODUCT) - *error = strdup("The service isolate is not implemented in product mode"); -@@ -81,7 +81,7 @@ Dart_Isolate IsolateCreateCallback(const char* uri, - return NULL; - } - --void IsolateShutdownCallback(void* callback_data) { -+void IsolateShutdownCallback(void* isolate_group_data, void* isolate_data) { - // The service isolate (and maybe later the kernel isolate) doesn't have an - // async loop. - auto dispatcher = async_get_default_dispatcher(); -@@ -92,8 +92,8 @@ void IsolateShutdownCallback(void* callback_data) { - } - } - --void IsolateCleanupCallback(void* callback_data) { -- delete static_cast*>(callback_data); -+void IsolateGroupCleanupCallback(void* isolate_group_data) { -+ delete static_cast*>(isolate_group_data); - } - - void RunApplication( -@@ -167,9 +167,9 @@ DartRunner::DartRunner() : context_(sys::ComponentContext::Create()) { - params.vm_snapshot_data = vm_snapshot_data_.address(); - params.vm_snapshot_instructions = vm_snapshot_instructions_.address(); - #endif -- params.create = IsolateCreateCallback; -- params.shutdown = IsolateShutdownCallback; -- params.cleanup = IsolateCleanupCallback; -+ params.create_group = IsolateGroupCreateCallback; -+ params.shutdown_isolate = IsolateShutdownCallback; -+ params.cleanup_group = IsolateGroupCleanupCallback; - params.entropy_source = EntropySource; - #if !defined(DART_PRODUCT) - params.get_service_assets = GetVMServiceAssetsArchiveCallback; -diff --git a/shell/platform/fuchsia/dart/service_isolate.cc b/shell/platform/fuchsia/dart/service_isolate.cc -index 2e6eda265..5287d638f 100644 ---- a/shell/platform/fuchsia/dart/service_isolate.cc -+++ b/shell/platform/fuchsia/dart/service_isolate.cc -@@ -123,14 +123,14 @@ Dart_Isolate CreateServiceIsolate(const char* uri, - #endif - - auto state = new std::shared_ptr(new tonic::DartState()); -- Dart_Isolate isolate = Dart_CreateIsolate( -+ Dart_Isolate isolate = Dart_CreateIsolateGroup( - uri, DART_VM_SERVICE_ISOLATE_NAME, mapped_isolate_snapshot_data.address(), - mapped_isolate_snapshot_instructions.address(), - mapped_shared_snapshot_data.address(), -- mapped_shared_snapshot_instructions.address(), nullptr /* flags */, state, -- error); -+ mapped_shared_snapshot_instructions.address(), nullptr /* flags */, -+ state /* isolate_group_data */, state /* isolate_data */, error); - if (!isolate) { -- FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolate failed: %s", *error); -+ FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolateGroup failed: %s", *error); - return nullptr; - } - diff --git a/tools/patches/flutter-engine/1e43d65d4ab6cb8b79562d83550d5e37f33abb50.patch b/tools/patches/flutter-engine/1e43d65d4ab6cb8b79562d83550d5e37f33abb50.patch deleted file mode 100644 index bceade5f9b1..00000000000 --- a/tools/patches/flutter-engine/1e43d65d4ab6cb8b79562d83550d5e37f33abb50.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/DEPS b/DEPS -index c395874b2..36f4de34b 100644 ---- a/DEPS -+++ b/DEPS -@@ -96,6 +96,7 @@ vars = { - 'dart_term_glyph_tag': '1.0.1', - 'dart_test_reflective_loader_tag': '0.1.8', - 'dart_test_tag': 'test-v1.6.4', -+ 'dart_tflite_native_rev': '712b8a93fbb4caf83ffed37f154da88c2a517a91', - 'dart_typed_data_tag': '1.1.6', - 'dart_usage_tag': '3.4.0', - 'dart_watcher_rev': '0.9.7+12-pub', -@@ -343,6 +344,9 @@ deps = { - 'src/third_party/dart/third_party/pkg/test': - Var('dart_git') + '/test.git' + '@' + Var('dart_test_tag'), - -+ 'src/third_party/dart/third_party/pkg/tflite_native': -+ Var('dart_git') + '/tflite_native.git' + '@' + Var('dart_tflite_native_rev'), -+ - 'src/third_party/dart/third_party/pkg/test_reflective_loader': - Var('dart_git') + '/test_reflective_loader.git' + '@' + Var('dart_test_reflective_loader_tag'), - -@@ -491,6 +495,16 @@ deps = { - 'dep_type': 'cipd', - }, - -+ 'src/third_party/dart/pkg/analysis_server/language_model': { -+ 'packages': [ -+ { -+ 'package': 'dart/language_model', -+ 'version': 'gABkW8D_-f45it57vQ_ZTKFwev16RcCjvrdTCytEnQgC', -+ } -+ ], -+ 'dep_type': 'cipd', -+ }, -+ - 'src/flutter/third_party/gn': { - 'packages': [ - { diff --git a/tools/patches/flutter-engine/67ab3be10d35d994641da167cc806f20a7ffa679.patch b/tools/patches/flutter-engine/67ab3be10d35d994641da167cc806f20a7ffa679.patch deleted file mode 100644 index d4fdc5929ca..00000000000 --- a/tools/patches/flutter-engine/67ab3be10d35d994641da167cc806f20a7ffa679.patch +++ /dev/null @@ -1,232 +0,0 @@ -diff --git a/runtime/dart_isolate.cc b/runtime/dart_isolate.cc -index b649ca834..e181dd55b 100644 ---- a/runtime/dart_isolate.cc -+++ b/runtime/dart_isolate.cc -@@ -163,7 +163,7 @@ bool DartIsolate::Initialize(Dart_Isolate dart_isolate, bool is_root_isolate) { - } - - auto* isolate_data = static_cast*>( -- Dart_IsolateGroupData(dart_isolate)); -+ Dart_IsolateData(dart_isolate)); - if (isolate_data->get() != this) { - return false; - } -@@ -174,7 +174,7 @@ bool DartIsolate::Initialize(Dart_Isolate dart_isolate, bool is_root_isolate) { - // We are entering a new scope (for the first time since initialization) and - // we want to restore the current scope to null when we exit out of this - // method. This balances the implicit Dart_EnterIsolate call made by -- // Dart_CreateIsolateGroup (which calls the Initialize). -+ // Dart_CreateIsolate (which calls the Initialize). - Dart_ExitIsolate(); - - tonic::DartIsolateScope scope(isolate()); -@@ -636,8 +636,8 @@ Dart_Isolate DartIsolate::DartCreateAndStartServiceIsolate( - return service_isolate->isolate(); - } - --// |Dart_IsolateGroupCreateCallback| --Dart_Isolate DartIsolate::DartIsolateGroupCreateCallback( -+// |Dart_IsolateCreateCallback| -+Dart_Isolate DartIsolate::DartIsolateCreateCallback( - const char* advisory_script_uri, - const char* advisory_script_entrypoint, - const char* package_root, -@@ -720,16 +720,14 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair( - } - - // Create the Dart VM isolate and give it the embedder object as the baton. -- Dart_Isolate isolate = Dart_CreateIsolateGroup( -+ Dart_Isolate isolate = Dart_CreateIsolate( - advisory_script_uri, // - advisory_script_entrypoint, // - (*embedder_isolate)->GetIsolateSnapshot()->GetDataMapping(), - (*embedder_isolate)->GetIsolateSnapshot()->GetInstructionsMapping(), - (*embedder_isolate)->GetSharedSnapshot()->GetDataMapping(), - (*embedder_isolate)->GetSharedSnapshot()->GetInstructionsMapping(), flags, -- embedder_isolate.get(), // isolate_group_data -- embedder_isolate.get(), // isolate_data -- error); -+ embedder_isolate.get(), error); - - if (isolate == nullptr) { - FML_DLOG(ERROR) << *error; -@@ -772,15 +770,14 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair( - - // |Dart_IsolateShutdownCallback| - void DartIsolate::DartIsolateShutdownCallback( -- std::shared_ptr* isolate_group_data, -- std::shared_ptr* isolate_data) { -- isolate_group_data->get()->OnShutdownCallback(); -+ std::shared_ptr* embedder_isolate) { -+ embedder_isolate->get()->OnShutdownCallback(); - } - --// |Dart_IsolateGroupCleanupCallback| --void DartIsolate::DartIsolateGroupCleanupCallback( -- std::shared_ptr* isolate_group_data) { -- delete isolate_group_data; -+// |Dart_IsolateCleanupCallback| -+void DartIsolate::DartIsolateCleanupCallback( -+ std::shared_ptr* embedder_isolate) { -+ delete embedder_isolate; - } - - fml::RefPtr DartIsolate::GetIsolateSnapshot() const { -diff --git a/runtime/dart_isolate.h b/runtime/dart_isolate.h -index 453810b1b..407852dc2 100644 ---- a/runtime/dart_isolate.h -+++ b/runtime/dart_isolate.h -@@ -156,8 +156,8 @@ class DartIsolate : public UIDartState { - - void OnShutdownCallback(); - -- // |Dart_IsolateGroupCreateCallback| -- static Dart_Isolate DartIsolateGroupCreateCallback( -+ // |Dart_IsolateCreateCallback| -+ static Dart_Isolate DartIsolateCreateCallback( - const char* advisory_script_uri, - const char* advisory_script_entrypoint, - const char* package_root, -@@ -186,12 +186,11 @@ class DartIsolate : public UIDartState { - - // |Dart_IsolateShutdownCallback| - static void DartIsolateShutdownCallback( -- std::shared_ptr* isolate_group_data, -- std::shared_ptr* isolate_data); -+ std::shared_ptr* embedder_isolate); - -- // |Dart_IsolateGroupCleanupCallback| -- static void DartIsolateGroupCleanupCallback( -- std::shared_ptr* isolate_group_data); -+ // |Dart_IsolateCleanupCallback| -+ static void DartIsolateCleanupCallback( -+ std::shared_ptr* embedder_isolate); - - FML_DISALLOW_COPY_AND_ASSIGN(DartIsolate); - }; -diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc -index 555d0c9ee..903e74b15 100644 ---- a/runtime/dart_vm.cc -+++ b/runtime/dart_vm.cc -@@ -366,13 +366,12 @@ DartVM::DartVM(std::shared_ptr vm_data, - params.vm_snapshot_data = vm_data_->GetVMSnapshot().GetDataMapping(); - params.vm_snapshot_instructions = - vm_data_->GetVMSnapshot().GetInstructionsMapping(); -- params.create_group = reinterpret_cast( -- DartIsolate::DartIsolateGroupCreateCallback); -- params.shutdown_isolate = -- reinterpret_cast( -- DartIsolate::DartIsolateShutdownCallback); -- params.cleanup_group = reinterpret_cast( -- DartIsolate::DartIsolateGroupCleanupCallback); -+ params.create = reinterpret_cast( -+ DartIsolate::DartIsolateCreateCallback); -+ params.shutdown = reinterpret_cast( -+ DartIsolate::DartIsolateShutdownCallback); -+ params.cleanup = reinterpret_cast( -+ DartIsolate::DartIsolateCleanupCallback); - params.thread_exit = ThreadExitCallback; - params.get_service_assets = GetVMServiceAssetsArchiveCallback; - params.entropy_source = dart::bin::GetEntropy; -diff --git a/shell/platform/fuchsia/dart/dart_component_controller.cc b/shell/platform/fuchsia/dart/dart_component_controller.cc -index c8e7cc5ab..1c4f71050 100644 ---- a/shell/platform/fuchsia/dart/dart_component_controller.cc -+++ b/shell/platform/fuchsia/dart/dart_component_controller.cc -@@ -324,13 +324,12 @@ bool DartComponentController::CreateIsolate( - auto state = new std::shared_ptr(new tonic::DartState( - namespace_fd, [this](Dart_Handle result) { MessageEpilogue(result); })); - -- isolate_ = Dart_CreateIsolateGroup( -+ isolate_ = Dart_CreateIsolate( - url_.c_str(), label_.c_str(), isolate_snapshot_data, - isolate_snapshot_instructions, shared_snapshot_data, -- shared_snapshot_instructions, nullptr /* flags */, -- state /* isolate_group_data */, state /* isolate_data */, &error); -+ shared_snapshot_instructions, nullptr /* flags */, state, &error); - if (!isolate_) { -- FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolateGroup failed: %s", error); -+ FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolate failed: %s", error); - return false; - } - -diff --git a/shell/platform/fuchsia/dart/dart_runner.cc b/shell/platform/fuchsia/dart/dart_runner.cc -index b9ded3ac4..200500d2c 100644 ---- a/shell/platform/fuchsia/dart/dart_runner.cc -+++ b/shell/platform/fuchsia/dart/dart_runner.cc -@@ -61,13 +61,13 @@ const char* kDartVMArgs[] = { - // clang-format on - }; - --Dart_Isolate IsolateGroupCreateCallback(const char* uri, -- const char* name, -- const char* package_root, -- const char* package_config, -- Dart_IsolateFlags* flags, -- void* callback_data, -- char** error) { -+Dart_Isolate IsolateCreateCallback(const char* uri, -+ const char* name, -+ const char* package_root, -+ const char* package_config, -+ Dart_IsolateFlags* flags, -+ void* callback_data, -+ char** error) { - if (std::string(uri) == DART_VM_SERVICE_ISOLATE_NAME) { - #if defined(DART_PRODUCT) - *error = strdup("The service isolate is not implemented in product mode"); -@@ -81,7 +81,7 @@ Dart_Isolate IsolateGroupCreateCallback(const char* uri, - return NULL; - } - --void IsolateShutdownCallback(void* isolate_group_data, void* isolate_data) { -+void IsolateShutdownCallback(void* callback_data) { - // The service isolate (and maybe later the kernel isolate) doesn't have an - // async loop. - auto dispatcher = async_get_default_dispatcher(); -@@ -92,8 +92,8 @@ void IsolateShutdownCallback(void* isolate_group_data, void* isolate_data) { - } - } - --void IsolateGroupCleanupCallback(void* isolate_group_data) { -- delete static_cast*>(isolate_group_data); -+void IsolateCleanupCallback(void* callback_data) { -+ delete static_cast*>(callback_data); - } - - void RunApplication( -@@ -167,9 +167,9 @@ DartRunner::DartRunner() : context_(sys::ComponentContext::Create()) { - params.vm_snapshot_data = vm_snapshot_data_.address(); - params.vm_snapshot_instructions = vm_snapshot_instructions_.address(); - #endif -- params.create_group = IsolateGroupCreateCallback; -- params.shutdown_isolate = IsolateShutdownCallback; -- params.cleanup_group = IsolateGroupCleanupCallback; -+ params.create = IsolateCreateCallback; -+ params.shutdown = IsolateShutdownCallback; -+ params.cleanup = IsolateCleanupCallback; - params.entropy_source = EntropySource; - #if !defined(DART_PRODUCT) - params.get_service_assets = GetVMServiceAssetsArchiveCallback; -diff --git a/shell/platform/fuchsia/dart/service_isolate.cc b/shell/platform/fuchsia/dart/service_isolate.cc -index 5287d638f..2e6eda265 100644 ---- a/shell/platform/fuchsia/dart/service_isolate.cc -+++ b/shell/platform/fuchsia/dart/service_isolate.cc -@@ -123,14 +123,14 @@ Dart_Isolate CreateServiceIsolate(const char* uri, - #endif - - auto state = new std::shared_ptr(new tonic::DartState()); -- Dart_Isolate isolate = Dart_CreateIsolateGroup( -+ Dart_Isolate isolate = Dart_CreateIsolate( - uri, DART_VM_SERVICE_ISOLATE_NAME, mapped_isolate_snapshot_data.address(), - mapped_isolate_snapshot_instructions.address(), - mapped_shared_snapshot_data.address(), -- mapped_shared_snapshot_instructions.address(), nullptr /* flags */, -- state /* isolate_group_data */, state /* isolate_data */, error); -+ mapped_shared_snapshot_instructions.address(), nullptr /* flags */, state, -+ error); - if (!isolate) { -- FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolateGroup failed: %s", *error); -+ FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolate failed: %s", *error); - return nullptr; - } - diff --git a/tools/patches/flutter-engine/6a65ea9cad4b014f88d2f1be1b321db493725a1c.patch b/tools/patches/flutter-engine/6a65ea9cad4b014f88d2f1be1b321db493725a1c.patch deleted file mode 100644 index a5652336f6b..00000000000 --- a/tools/patches/flutter-engine/6a65ea9cad4b014f88d2f1be1b321db493725a1c.patch +++ /dev/null @@ -1,622 +0,0 @@ -diff --git a/DEPS b/DEPS -index 3e0e5d6dc52a..50e2d0298e18 100644 ---- a/DEPS -+++ b/DEPS -@@ -42,8 +42,8 @@ vars = { - 'dart_async_tag': '2.0.8', - 'dart_bazel_worker_tag': 'bazel_worker-v0.1.20', - 'dart_boolean_selector_tag': '1.0.4', -- 'dart_boringssl_gen_rev': 'bbf52f18f425e29b1185f2f6753bec02ed8c5880', -- 'dart_boringssl_rev': '702e2b6d3831486535e958f262a05c75a5cb312e', -+ 'dart_boringssl_gen_rev': 'b9e27cff1ff0803e97ab1f88764a83be4aa94a6d', -+ 'dart_boringssl_rev': '4dfd5af70191b068aebe567b8e29ce108cee85ce', - 'dart_charcode_tag': 'v1.1.2', - 'dart_cli_util_rev': '4ad7ccbe3195fd2583b30f86a86697ef61e80f41', - 'dart_collection_tag': '1.14.11', -diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party -index 13daa0f54247..e516f2420475 100644 ---- a/ci/licenses_golden/licenses_third_party -+++ b/ci/licenses_golden/licenses_third_party -@@ -1,4 +1,4 @@ --Signature: bc14a6c15e2ed1c6819d722a808248b9 -+Signature: 5f2b1df54ae6e4ec5836a1d12bf7c70e - - UNUSED LICENSES: - -@@ -3256,6 +3256,7 @@ FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/rsaz_exp.c - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/rsaz_exp.h - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/p256-x86_64.c - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/p256-x86_64.h -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/fips_shared.lds - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/intcheck1.png - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/intcheck2.png - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/intcheck3.png -@@ -3280,6 +3281,32 @@ FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCryp - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/styles.xml - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/theme/theme1.xml - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/webSettings.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/[Content_Types].xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/_rels/.rels -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/customXml/_rels/item1.xml.rels -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/customXml/item1.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/customXml/itemProps1.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/docProps/app.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/docProps/core.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/docProps/thumbnail.emf -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/_rels/document.xml.rels -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/document.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/endnotes.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/fontTable.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/footer1.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/footer2.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/footer3.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/footnotes.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/header1.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/header2.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/header3.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/media/image1.png -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/media/image2.png -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/numbering.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/settings.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/styles.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/theme/theme1.xml -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/webSettings.xml - FILE: ../../../third_party/boringssl/src/crypto/obj/obj_mac.num - FILE: ../../../third_party/boringssl/src/crypto/poly1305/poly1305_arm_asm.S - FILE: ../../../third_party/boringssl/src/crypto/rsa_extra/rsa_print.c -@@ -3293,9 +3320,9 @@ FILE: ../../../third_party/boringssl/src/crypto/x509/some_names2.pem - FILE: ../../../third_party/boringssl/src/crypto/x509/some_names3.pem - FILE: ../../../third_party/boringssl/src/crypto/x509/x509_time_test.cc - FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_ocsp.c --FILE: ../../../third_party/boringssl/src/fipstools/run_cavp.go --FILE: ../../../third_party/boringssl/src/infra/config/cq.cfg -+FILE: ../../../third_party/boringssl/src/go.mod - FILE: ../../../third_party/boringssl/src/ssl/bio_ssl.cc -+FILE: ../../../third_party/boringssl/src/ssl/ssl_c_test.c - FILE: ../../../third_party/boringssl/src/util/all_tests.json - FILE: ../../../third_party/boringssl/src/util/bot/UPDATING - FILE: ../../../third_party/boringssl/src/util/bot/cmake-linux64.tar.gz.sha1 -@@ -3304,10 +3331,19 @@ FILE: ../../../third_party/boringssl/src/util/bot/cmake-win32.zip.sha1 - FILE: ../../../third_party/boringssl/src/util/bot/nasm-win32.exe.sha1 - FILE: ../../../third_party/boringssl/src/util/bot/perl-win32.zip.sha1 - FILE: ../../../third_party/boringssl/src/util/bot/sde-linux64.tar.bz2.sha1 -+FILE: ../../../third_party/boringssl/src/util/bot/sde-win32.tar.bz2.sha1 - FILE: ../../../third_party/boringssl/src/util/bot/yasm-win32.exe.sha1 - FILE: ../../../third_party/boringssl/src/util/doc.config - FILE: ../../../third_party/boringssl/src/util/doc.go --FILE: ../../../third_party/boringssl/src/util/fipstools/delocate.peg.go -+FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/acvp.go -+FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/acvp/acvp.go -+FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/interactive.go -+FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/parser.peg -+FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/parser.peg.go -+FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/hash.go -+FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/subprocess.go -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/run_cavp.go -+FILE: ../../../third_party/boringssl/src/util/fipstools/delocate/delocate.peg.go - FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/bigint_patch.dart - FILE: ../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/bigint_patch.dart - ---------------------------------------------------------------------------------------------------- -@@ -3462,6 +3498,28 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - -+The code in third_party/sike also carries the MIT license: -+ -+Copyright (c) Microsoft Corporation. All rights reserved. -+ -+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: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE -+ - Licenses for support code - - Parts of the TLS test suite are under the Go license. This code is not included -@@ -4049,7 +4107,6 @@ FILE: ../../../third_party/boringssl/src/include/openssl/chacha.h - FILE: ../../../third_party/boringssl/src/include/openssl/crypto.h - FILE: ../../../third_party/boringssl/src/include/openssl/engine.h - FILE: ../../../third_party/boringssl/src/include/openssl/hkdf.h --FILE: ../../../third_party/boringssl/src/include/openssl/lhash_macros.h - FILE: ../../../third_party/boringssl/src/include/openssl/objects.h - FILE: ../../../third_party/boringssl/src/include/openssl/opensslconf.h - FILE: ../../../third_party/boringssl/src/include/openssl/opensslv.h -@@ -4226,41 +4283,41 @@ FILE: ../../../third_party/boringssl/src/crypto/rand_extra/rand_extra.c - FILE: ../../../third_party/boringssl/src/crypto/x509/make_many_constraints.go - FILE: ../../../third_party/boringssl/src/decrepit/cfb/cfb.c - FILE: ../../../third_party/boringssl/src/decrepit/cfb/cfb_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_aes_gcm_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_aes_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_ctr_drbg_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_ecdsa2_keypair_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_ecdsa2_pkv_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_ecdsa2_siggen_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_ecdsa2_sigver_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_hmac_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_keywrap_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_main.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_rsa2_keygen_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_rsa2_siggen_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_rsa2_sigver_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_sha_monte_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_sha_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_tdes_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_test_util.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_test_util.h --FILE: ../../../third_party/boringssl/src/fipstools/test_fips.c - FILE: ../../../third_party/boringssl/src/include/openssl/is_boringssl.h - FILE: ../../../third_party/boringssl/src/include/openssl/span.h - FILE: ../../../third_party/boringssl/src/ssl/span_test.cc - FILE: ../../../third_party/boringssl/src/ssl/ssl_versions.cc - FILE: ../../../third_party/boringssl/src/tool/file.cc - FILE: ../../../third_party/boringssl/src/tool/sign.cc -+FILE: ../../../third_party/boringssl/src/util/ar/ar.go - FILE: ../../../third_party/boringssl/src/util/check_imported_libraries.go - FILE: ../../../third_party/boringssl/src/util/convert_comments.go - FILE: ../../../third_party/boringssl/src/util/embed_test_data.go --FILE: ../../../third_party/boringssl/src/util/fipstools/ar.go - FILE: ../../../third_party/boringssl/src/util/fipstools/break-hash.go --FILE: ../../../third_party/boringssl/src/util/fipstools/const.go --FILE: ../../../third_party/boringssl/src/util/fipstools/delocate.go --FILE: ../../../third_party/boringssl/src/util/fipstools/delocate.peg --FILE: ../../../third_party/boringssl/src/util/fipstools/delocate_test.go --FILE: ../../../third_party/boringssl/src/util/fipstools/inject-hash.go -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_aes_gcm_test.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_aes_test.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_ctr_drbg_test.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_ecdsa2_keypair_test.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_ecdsa2_pkv_test.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_ecdsa2_siggen_test.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_ecdsa2_sigver_test.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_hmac_test.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_keywrap_test.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_main.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_rsa2_keygen_test.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_rsa2_siggen_test.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_rsa2_sigver_test.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_sha_monte_test.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_sha_test.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_tdes_test.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_test_util.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_test_util.h -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/test_fips.c -+FILE: ../../../third_party/boringssl/src/util/fipstools/delocate/delocate.go -+FILE: ../../../third_party/boringssl/src/util/fipstools/delocate/delocate.peg -+FILE: ../../../third_party/boringssl/src/util/fipstools/delocate/delocate_test.go -+FILE: ../../../third_party/boringssl/src/util/fipstools/fipscommon/const.go -+FILE: ../../../third_party/boringssl/src/util/fipstools/inject_hash/inject_hash.go - ---------------------------------------------------------------------------------------------------- - Copyright (c) 2017, Google Inc. - -@@ -4281,26 +4338,48 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - LIBRARY: boringssl - ORIGIN: ../../../third_party/boringssl/src/crypto/bytestring/unicode.c - TYPE: LicenseType.unknown -+FILE: ../../../third_party/boringssl/src/crypto/abi_self_test.cc - FILE: ../../../third_party/boringssl/src/crypto/bytestring/unicode.c - FILE: ../../../third_party/boringssl/src/crypto/chacha/internal.h - FILE: ../../../third_party/boringssl/src/crypto/cipher_extra/e_aesccm.c - FILE: ../../../third_party/boringssl/src/crypto/cpu-aarch64-fuchsia.c -+FILE: ../../../third_party/boringssl/src/crypto/cpu-arm-linux.h -+FILE: ../../../third_party/boringssl/src/crypto/cpu-arm-linux_test.cc - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/div_extra.c - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/gcd_extra.c - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/felem.c - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/make_ec_scalar_base_mult_tests.go - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/make_p256-x86_64-table.go -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/make_p256-x86_64-tests.go - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/scalar.c - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/simple_mul.c -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/md5/internal.h -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/md5/md5_test.cc -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/sha/internal.h -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/sha/sha_test.cc - FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/tls/internal.h -+FILE: ../../../third_party/boringssl/src/crypto/hrss/hrss.c -+FILE: ../../../third_party/boringssl/src/crypto/hrss/hrss_test.cc -+FILE: ../../../third_party/boringssl/src/crypto/hrss/internal.h -+FILE: ../../../third_party/boringssl/src/crypto/impl_dispatch_test.cc - FILE: ../../../third_party/boringssl/src/crypto/pem/pem_test.cc -+FILE: ../../../third_party/boringssl/src/crypto/rand_extra/rand_test.cc - FILE: ../../../third_party/boringssl/src/crypto/self_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_kas_test.cc --FILE: ../../../third_party/boringssl/src/fipstools/cavp_tlskdf_test.cc -+FILE: ../../../third_party/boringssl/src/crypto/stack/stack_test.cc -+FILE: ../../../third_party/boringssl/src/crypto/x509v3/internal.h - FILE: ../../../third_party/boringssl/src/include/openssl/e_os2.h -+FILE: ../../../third_party/boringssl/src/include/openssl/hrss.h - FILE: ../../../third_party/boringssl/src/ssl/handoff.cc -+FILE: ../../../third_party/boringssl/src/third_party/sike/sike_test.cc -+FILE: ../../../third_party/boringssl/src/util/ar/ar_test.go - FILE: ../../../third_party/boringssl/src/util/check_filenames.go - FILE: ../../../third_party/boringssl/src/util/convert_wycheproof.go -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_kas_test.cc -+FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_tlskdf_test.cc -+FILE: ../../../third_party/boringssl/src/util/godeps.go -+FILE: ../../../third_party/boringssl/src/util/make_prefix_headers.go -+FILE: ../../../third_party/boringssl/src/util/read_symbols.go -+FILE: ../../../third_party/boringssl/src/util/testresult/testresult.go - ---------------------------------------------------------------------------------------------------- - Copyright (c) 2018, Google Inc. - -@@ -5647,6 +5726,33 @@ in the file LICENSE in the source distribution or at - https://www.openssl.org/source/license.html - ==================================================================================================== - -+==================================================================================================== -+LIBRARY: boringssl -+ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/fips_shared_support.c -+TYPE: LicenseType.unknown -+FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/fips_shared_support.c -+FILE: ../../../third_party/boringssl/src/crypto/siphash/siphash.c -+FILE: ../../../third_party/boringssl/src/crypto/siphash/siphash_test.cc -+FILE: ../../../third_party/boringssl/src/decrepit/blowfish/blowfish_test.cc -+FILE: ../../../third_party/boringssl/src/decrepit/cast/cast_test.cc -+FILE: ../../../third_party/boringssl/src/include/openssl/siphash.h -+FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/modulewrapper/modulewrapper.cc -+---------------------------------------------------------------------------------------------------- -+Copyright (c) 2019, Google Inc. -+ -+Permission to use, copy, modify, and/or distribute this software for any -+purpose with or without fee is hereby granted, provided that the above -+copyright notice and this permission notice appear in all copies. -+ -+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION -+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+==================================================================================================== -+ - ==================================================================================================== - LIBRARY: boringssl - ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/modes/cbc.c -@@ -5880,6 +5986,27 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - OF THE POSSIBILITY OF SUCH DAMAGE. - ==================================================================================================== - -+==================================================================================================== -+LIBRARY: boringssl -+ORIGIN: ../../../third_party/boringssl/src/crypto/hrss/asm/poly_rq_mul.S -+TYPE: LicenseType.unknown -+FILE: ../../../third_party/boringssl/src/crypto/hrss/asm/poly_rq_mul.S -+---------------------------------------------------------------------------------------------------- -+Copyright (c) 2017, the HRSS authors. -+ -+Permission to use, copy, modify, and/or distribute this software for any -+purpose with or without fee is hereby granted, provided that the above -+copyright notice and this permission notice appear in all copies. -+ -+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION -+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+==================================================================================================== -+ - ==================================================================================================== - LIBRARY: boringssl - ORIGIN: ../../../third_party/boringssl/src/crypto/pem/pem_all.c -@@ -6620,6 +6747,10 @@ LIBRARY: boringssl - ORIGIN: ../../../third_party/boringssl/src/third_party/fiat/LICENSE - TYPE: LicenseType.mit - FILE: ../../../third_party/boringssl/src/third_party/fiat/METADATA -+FILE: ../../../third_party/boringssl/src/third_party/fiat/curve25519_32.h -+FILE: ../../../third_party/boringssl/src/third_party/fiat/curve25519_64.h -+FILE: ../../../third_party/boringssl/src/third_party/fiat/p256_32.h -+FILE: ../../../third_party/boringssl/src/third_party/fiat/p256_64.h - ---------------------------------------------------------------------------------------------------- - The MIT License (MIT) - -@@ -6705,17 +6836,17 @@ SOFTWARE. - LIBRARY: boringssl - ORIGIN: ../../../third_party/boringssl/src/third_party/googletest/LICENSE - TYPE: LicenseType.bsd --FILE: ../../../third_party/boringssl/src/third_party/googletest/CHANGES - FILE: ../../../third_party/boringssl/src/third_party/googletest/CONTRIBUTORS - FILE: ../../../third_party/boringssl/src/third_party/googletest/METADATA -+FILE: ../../../third_party/boringssl/src/third_party/googletest/cmake/Config.cmake.in - FILE: ../../../third_party/boringssl/src/third_party/googletest/cmake/gtest.pc.in - FILE: ../../../third_party/boringssl/src/third_party/googletest/cmake/gtest_main.pc.in -+FILE: ../../../third_party/boringssl/src/third_party/googletest/cmake/libgtest.la.in - FILE: ../../../third_party/boringssl/src/third_party/googletest/codegear/gtest.cbproj - FILE: ../../../third_party/boringssl/src/third_party/googletest/codegear/gtest.groupproj - FILE: ../../../third_party/boringssl/src/third_party/googletest/codegear/gtest_main.cbproj - FILE: ../../../third_party/boringssl/src/third_party/googletest/codegear/gtest_unittest.cbproj - FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-param-test.h --FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-param-test.h.pump - FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-test-part.h - FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-filepath.h - FILE: ../../../third_party/boringssl/src/third_party/googletest/msvc/2010/gtest-md.sln -@@ -6823,10 +6954,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - ==================================================================================================== - LIBRARY: boringssl --ORIGIN: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-printers.h -+ORIGIN: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-matchers.h - TYPE: LicenseType.bsd -+FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-matchers.h - FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-printers.h - FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-spi.h -+FILE: ../../../third_party/boringssl/src/third_party/googletest/src/gtest-matchers.cc - FILE: ../../../third_party/boringssl/src/third_party/googletest/src/gtest-printers.cc - ---------------------------------------------------------------------------------------------------- - Copyright 2007, Google Inc. -@@ -6995,47 +7128,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - ==================================================================================================== - LIBRARY: boringssl --ORIGIN: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-linked_ptr.h --TYPE: LicenseType.bsd --FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-linked_ptr.h ------------------------------------------------------------------------------------------------------ --Copyright 2003 Google Inc. --All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are --met: -- -- * Redistributions of source code must retain the above copyright --notice, this list of conditions and the following disclaimer. -- * Redistributions in binary form must reproduce the above --copyright notice, this list of conditions and the following disclaimer --in the documentation and/or other materials provided with the --distribution. -- * Neither the name of Google Inc. nor the names of its --contributors may be used to endorse or promote products derived from --this software without specific prior written permission. -- --THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS --"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT --LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR --A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT --OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, --SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT --LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, --DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY --THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT --(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE --OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --==================================================================================================== -- --==================================================================================================== --LIBRARY: boringssl --ORIGIN: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-param-util-generated.h -+ORIGIN: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-param-util.h - TYPE: LicenseType.bsd - FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-typed-test.h --FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-param-util-generated.h --FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-param-util-generated.h.pump - FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-param-util.h - FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-type-util.h - FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-type-util.h.pump -@@ -7077,13 +7172,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - ==================================================================================================== - LIBRARY: boringssl --ORIGIN: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-tuple.h -+ORIGIN: ../../../third_party/boringssl/src/third_party/googletest/samples/sample10_unittest.cc - TYPE: LicenseType.bsd --FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-tuple.h --FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-tuple.h.pump -+FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample10_unittest.cc -+FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample9_unittest.cc - ---------------------------------------------------------------------------------------------------- --Copyright 2009 Google Inc. --All Rights Reserved. -+Copyright 2009 Google Inc. All Rights Reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are -@@ -7114,38 +7208,39 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - ==================================================================================================== - LIBRARY: boringssl --ORIGIN: ../../../third_party/boringssl/src/third_party/googletest/samples/sample10_unittest.cc --TYPE: LicenseType.bsd --FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample10_unittest.cc --FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample9_unittest.cc -+ORIGIN: ../../../third_party/boringssl/src/third_party/sike/LICENSE -+TYPE: LicenseType.mit -+FILE: ../../../third_party/boringssl/src/third_party/sike/asm/fp_generic.c -+FILE: ../../../third_party/boringssl/src/third_party/sike/curve_params.c -+FILE: ../../../third_party/boringssl/src/third_party/sike/fpx.c -+FILE: ../../../third_party/boringssl/src/third_party/sike/fpx.h -+FILE: ../../../third_party/boringssl/src/third_party/sike/isogeny.c -+FILE: ../../../third_party/boringssl/src/third_party/sike/isogeny.h -+FILE: ../../../third_party/boringssl/src/third_party/sike/sike.c -+FILE: ../../../third_party/boringssl/src/third_party/sike/sike.h -+FILE: ../../../third_party/boringssl/src/third_party/sike/utils.h - ---------------------------------------------------------------------------------------------------- --Copyright 2009 Google Inc. All Rights Reserved. -+MIT License - --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are --met: -+Copyright (c) Microsoft Corporation. All rights reserved. - -- * Redistributions of source code must retain the above copyright --notice, this list of conditions and the following disclaimer. -- * Redistributions in binary form must reproduce the above --copyright notice, this list of conditions and the following disclaimer --in the documentation and/or other materials provided with the --distribution. -- * Neither the name of Google Inc. nor the names of its --contributors may be used to endorse or promote products derived from --this software without specific prior written permission. -+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: - --THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS --"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT --LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR --A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT --OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, --SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT --LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, --DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY --THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT --(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE --OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE - ==================================================================================================== - - ==================================================================================================== -@@ -7155,8 +7250,11 @@ TYPE: LicenseType.unknown - FILE: ../../../third_party/boringssl/ios-aarch64/crypto/chacha/chacha-armv8.S - FILE: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/aesv8-armx64.S - FILE: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/armv8-mont.S -+FILE: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/ghash-neon-armv8.S - FILE: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/ghashv8-armx64.S - FILE: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha1-armv8.S -+FILE: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/vpaes-armv8.S -+FILE: ../../../third_party/boringssl/ios-aarch64/crypto/third_party/sike/asm/fp-armv8.S - FILE: ../../../third_party/boringssl/ios-arm/crypto/chacha/chacha-armv4.S - FILE: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/aesv8-armx32.S - FILE: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/armv4-mont.S -@@ -7166,8 +7264,11 @@ FILE: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/sha1-armv4-large. - FILE: ../../../third_party/boringssl/linux-aarch64/crypto/chacha/chacha-armv8.S - FILE: ../../../third_party/boringssl/linux-aarch64/crypto/fipsmodule/aesv8-armx64.S - FILE: ../../../third_party/boringssl/linux-aarch64/crypto/fipsmodule/armv8-mont.S -+FILE: ../../../third_party/boringssl/linux-aarch64/crypto/fipsmodule/ghash-neon-armv8.S - FILE: ../../../third_party/boringssl/linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S - FILE: ../../../third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha1-armv8.S -+FILE: ../../../third_party/boringssl/linux-aarch64/crypto/fipsmodule/vpaes-armv8.S -+FILE: ../../../third_party/boringssl/linux-aarch64/crypto/third_party/sike/asm/fp-armv8.S - FILE: ../../../third_party/boringssl/linux-arm/crypto/chacha/chacha-armv4.S - FILE: ../../../third_party/boringssl/linux-arm/crypto/fipsmodule/aesv8-armx32.S - FILE: ../../../third_party/boringssl/linux-arm/crypto/fipsmodule/armv4-mont.S -@@ -7181,6 +7282,7 @@ FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/aes-586.S - FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/aesni-x86.S - FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/bn-586.S - FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/co-586.S -+FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/ghash-ssse3-x86.S - FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/ghash-x86.S - FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/md5-586.S - FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/sha1-586.S -@@ -7194,10 +7296,11 @@ FILE: ../../../third_party/boringssl/linux-x86_64/crypto/cipher_extra/chacha20_p - FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/aes-x86_64.S - FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S - FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S --FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/bsaes-x86_64.S -+FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S - FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/ghash-x86_64.S - FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/md5-x86_64.S - FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/p256-x86_64-asm.S -+FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.S - FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/rdrand-x86_64.S - FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/rsaz-avx2.S - FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/sha1-x86_64.S -@@ -7206,11 +7309,13 @@ FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/sha512-x86_6 - FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S - FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/x86_64-mont.S - FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/x86_64-mont5.S -+FILE: ../../../third_party/boringssl/linux-x86_64/crypto/third_party/sike/asm/fp-x86_64.S - FILE: ../../../third_party/boringssl/mac-x86/crypto/chacha/chacha-x86.S - FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/aes-586.S - FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/aesni-x86.S - FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/bn-586.S - FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/co-586.S -+FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/ghash-ssse3-x86.S - FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/ghash-x86.S - FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/md5-586.S - FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/sha1-586.S -@@ -7224,10 +7329,11 @@ FILE: ../../../third_party/boringssl/mac-x86_64/crypto/cipher_extra/chacha20_pol - FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/aes-x86_64.S - FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S - FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S --FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/bsaes-x86_64.S -+FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S - FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/ghash-x86_64.S - FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/md5-x86_64.S - FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/p256-x86_64-asm.S -+FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.S - FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/rdrand-x86_64.S - FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/rsaz-avx2.S - FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/sha1-x86_64.S -@@ -7236,11 +7342,13 @@ FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/sha512-x86_64. - FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/vpaes-x86_64.S - FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/x86_64-mont.S - FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/x86_64-mont5.S -+FILE: ../../../third_party/boringssl/mac-x86_64/crypto/third_party/sike/asm/fp-x86_64.S - FILE: ../../../third_party/boringssl/win-x86/crypto/chacha/chacha-x86.asm - FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/aes-586.asm - FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/aesni-x86.asm - FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/bn-586.asm - FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/co-586.asm -+FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/ghash-ssse3-x86.asm - FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/ghash-x86.asm - FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/md5-586.asm - FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/sha1-586.asm -@@ -7254,10 +7362,11 @@ FILE: ../../../third_party/boringssl/win-x86_64/crypto/cipher_extra/chacha20_pol - FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/aes-x86_64.asm - FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.asm - FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/aesni-x86_64.asm --FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/bsaes-x86_64.asm -+FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.asm - FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/ghash-x86_64.asm - FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/md5-x86_64.asm - FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/p256-x86_64-asm.asm -+FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.asm - FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/rdrand-x86_64.asm - FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/rsaz-avx2.asm - FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/sha1-x86_64.asm -@@ -7266,6 +7375,7 @@ FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/sha512-x86_64. - FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/vpaes-x86_64.asm - FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/x86_64-mont.asm - FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/x86_64-mont5.asm -+FILE: ../../../third_party/boringssl/win-x86_64/crypto/third_party/sike/asm/fp-x86_64.asm - ---------------------------------------------------------------------------------------------------- - - ==================================================================================================== -@@ -23186,4 +23296,4 @@ freely, subject to the following restrictions: - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - ==================================================================================================== --Total license count: 361 -+Total license count: 362 -diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart -index 19117b13b4fc..3088076b8661 100644 ---- a/tools/licenses/lib/main.dart -+++ b/tools/licenses/lib/main.dart -@@ -1889,7 +1889,7 @@ class _RepositoryBoringSSLDirectory extends _RepositoryDirectory { - _RepositoryDirectory createSubdirectory(fs.Directory entry) { - if (entry.name == 'src') - return _RepositoryBoringSSLSourceDirectory(this, entry); -- return super.createSubdirectory(entry); -+ return _RepositoryBoringSSLDirectory(this, entry); - } - } - diff --git a/tools/patches/flutter-engine/6e2b3f0326bc15ad938319cbbb151f183d064609.patch b/tools/patches/flutter-engine/6e2b3f0326bc15ad938319cbbb151f183d064609.patch deleted file mode 100644 index 2c8dada0211..00000000000 --- a/tools/patches/flutter-engine/6e2b3f0326bc15ad938319cbbb151f183d064609.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/DEPS b/DEPS -index 6205f1b6d..5c1cbf3bc 100644 ---- a/DEPS -+++ b/DEPS -@@ -72,7 +72,7 @@ vars = { - 'dart_mustache_tag': '5e81b12215566dbe2473b2afd01a8a8aedd56ad9', - 'dart_oauth2_tag': '1.2.1', - 'dart_observatory_pub_packages_rev': '0894122173b0f98eb08863a7712e78407d4477bc', -- 'dart_package_config_tag': '1.0.5', -+ 'dart_package_config_tag': '2453cd2e78c2db56ee2669ced17ce70dd00bf576', - 'dart_package_resolver_tag': '1.0.10', - 'dart_path_tag': '1.6.2', - 'dart_pedantic_tag': 'v1.8.0', diff --git a/tools/patches/flutter-engine/8ba6f7e2eb8ac44b6de3e87a3062d1c8e34b6cc1.patch b/tools/patches/flutter-engine/8ba6f7e2eb8ac44b6de3e87a3062d1c8e34b6cc1.patch deleted file mode 100644 index 56ac868c079..00000000000 --- a/tools/patches/flutter-engine/8ba6f7e2eb8ac44b6de3e87a3062d1c8e34b6cc1.patch +++ /dev/null @@ -1,330 +0,0 @@ -From 6fefdfc884fb7858bd8cd981e1fdb493da8088b4 Mon Sep 17 00:00:00 2001 -From: Alexander Aprelev -Date: Mon, 7 Oct 2019 23:13:33 -0700 -Subject: [PATCH] 2 - ---- - BUILD.gn | 2 +- - ci/analyze.sh | 6 +- - .../.gitignore | 0 - flutter_frontend_server/BUILD.gn | 63 +++++++++++++++++ - .../README.md | 0 - .../bin/starter.dart | 2 +- - .../lib/server.dart | 2 +- - .../package_incremental.py | 8 +-- - .../pubspec.yaml | 0 - frontend_server/BUILD.gn | 68 ++----------------- - tools/generate_package_files.py | 2 +- - 11 files changed, 80 insertions(+), 73 deletions(-) - rename {frontend_server => flutter_frontend_server}/.gitignore (100%) - create mode 100644 flutter_frontend_server/BUILD.gn - rename {frontend_server => flutter_frontend_server}/README.md (100%) - rename {frontend_server => flutter_frontend_server}/bin/starter.dart (76%) - rename {frontend_server => flutter_frontend_server}/lib/server.dart (98%) - rename {frontend_server => flutter_frontend_server}/package_incremental.py (94%) - rename {frontend_server => flutter_frontend_server}/pubspec.yaml (100%) - -diff --git a/BUILD.gn b/BUILD.gn -index b894fe26f..e4ce1dea1 100644 ---- a/BUILD.gn -+++ b/BUILD.gn -@@ -42,7 +42,7 @@ group("flutter") { - if (!is_fuchsia && !is_fuchsia_host) { - if (current_toolchain == host_toolchain) { - public_deps += [ -- "$flutter_root/frontend_server", -+ "$flutter_root/flutter_frontend_server:frontend_server", - "//third_party/dart:create_sdk", - ] - -diff --git a/ci/analyze.sh b/ci/analyze.sh -index 9ee12a913..6b48c9447 100755 ---- a/ci/analyze.sh -+++ b/ci/analyze.sh -@@ -18,11 +18,11 @@ if [ -n "$RESULTS" ]; then - exit 1; - fi - --echo "Analyzing frontend_server..." -+echo "Analyzing flutter_frontend_server..." - RESULTS=`dartanalyzer \ -- --packages=flutter/frontend_server/.packages \ -+ --packages=flutter/flutter_frontend_server/.packages \ - --options flutter/analysis_options.yaml \ -- flutter/frontend_server \ -+ flutter/flutter_frontend_server \ - 2>&1 \ - | grep -Ev "No issues found!" \ - | grep -Ev "Analyzing.+frontend_server"` -diff --git a/frontend_server/.gitignore b/flutter_frontend_server/.gitignore -similarity index 100% -rename from frontend_server/.gitignore -rename to flutter_frontend_server/.gitignore -diff --git a/flutter_frontend_server/BUILD.gn b/flutter_frontend_server/BUILD.gn -new file mode 100644 -index 000000000..37740acaa ---- /dev/null -+++ b/flutter_frontend_server/BUILD.gn -@@ -0,0 +1,63 @@ -+# Copyright 2013 The Flutter Authors. All rights reserved. -+# Use of this source code is governed by a BSD-style license that can be -+# found in the LICENSE file. -+ -+if (!is_fuchsia_host && !is_fuchsia) { -+ import("//third_party/dart/utils/application_snapshot.gni") -+ -+ frontend_server_files = -+ exec_script("//third_party/dart/tools/list_dart_files.py", -+ [ -+ "absolute", -+ rebase_path("."), -+ ], -+ "list lines") -+ -+ frontend_server_files += -+ exec_script("//third_party/dart/tools/list_dart_files.py", -+ [ -+ "absolute", -+ rebase_path("../../third_party/dart/pkg"), -+ ], -+ "list lines") -+ -+ application_snapshot("frontend_server") { -+ main_dart = "bin/starter.dart" -+ deps = [ -+ ":package_incremental_compiler", -+ "$flutter_root/lib/snapshot:kernel_platform_files", -+ ] -+ dot_packages = rebase_path(".packages") -+ flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk") -+ training_args = [ -+ "--train", -+ "--sdk-root=$flutter_patched_sdk", -+ rebase_path(main_dart), -+ ] -+ -+ inputs = frontend_server_files -+ } -+ -+ # For flutter/flutter#36738 we make the source files available so that -+ # we can generate a local frontend_server snapshot in the tools cache. -+ action("package_incremental_compiler") { -+ script = "$flutter_root/flutter_frontend_server/package_incremental.py" -+ -+ inputs = frontend_server_files -+ -+ outputs = [ -+ "$root_gen_dir/dart-pkg/frontend_server/pubspec.yaml", -+ "$root_gen_dir/dart-pkg/vm/pubspec.yaml", -+ "$root_gen_dir/dart-pkg/build_integration/pubspec.yaml", -+ "$root_gen_dir/dart-pkg/front_end/pubspec.yaml", -+ "$root_gen_dir/dart-pkg/kernel/pubspec.yaml", -+ "$root_gen_dir/dart-pkg/dev_compiler/pubspec.yaml", -+ ] -+ -+ args = [ -+ "--input-root=" + rebase_path("//third_party/dart/pkg"), -+ "--output-root=" + rebase_path("$root_gen_dir/dart-pkg"), -+ "--frontend-server=" + rebase_path("$flutter_root"), -+ ] -+ } -+} -diff --git a/frontend_server/README.md b/flutter_frontend_server/README.md -similarity index 100% -rename from frontend_server/README.md -rename to flutter_frontend_server/README.md -diff --git a/frontend_server/bin/starter.dart b/flutter_frontend_server/bin/starter.dart -similarity index 76% -rename from frontend_server/bin/starter.dart -rename to flutter_frontend_server/bin/starter.dart -index da85e5575..862a8a7ea 100644 ---- a/frontend_server/bin/starter.dart -+++ b/flutter_frontend_server/bin/starter.dart -@@ -2,7 +2,7 @@ library frontend_server; - - import 'dart:io'; - --import 'package:frontend_server/server.dart'; -+import 'package:flutter_frontend_server/server.dart'; - - void main(List args) async { - final int exitCode = await starter(args); -diff --git a/frontend_server/lib/server.dart b/flutter_frontend_server/lib/server.dart -similarity index 98% -rename from frontend_server/lib/server.dart -rename to flutter_frontend_server/lib/server.dart -index 8e34efa93..24894c878 100644 ---- a/frontend_server/lib/server.dart -+++ b/flutter_frontend_server/lib/server.dart -@@ -11,7 +11,7 @@ import 'package:args/args.dart'; - import 'package:path/path.dart' as path; - - import 'package:vm/incremental_compiler.dart'; --import 'package:vm/frontend_server.dart' as frontend -+import 'package:frontend_server/frontend_server.dart' as frontend - show - FrontendCompiler, - CompilerInterface, -diff --git a/frontend_server/package_incremental.py b/flutter_frontend_server/package_incremental.py -similarity index 94% -rename from frontend_server/package_incremental.py -rename to flutter_frontend_server/package_incremental.py -index 63b019a33..a8b424260 100755 ---- a/frontend_server/package_incremental.py -+++ b/flutter_frontend_server/package_incremental.py -@@ -15,7 +15,7 @@ PACKAGES = [ - "kernel", - "front_end", - "dev_compiler", -- "frontend_server", -+ "flutter_frontend_server", - ] - - VM_PUBSPEC = r'''name: vm -@@ -41,7 +41,7 @@ dependencies: - meta: any - ''' - --FRONTEND_SERVER_PUBSPEC = r'''name: frontend_server -+FLUTTER_FRONTEND_SERVER_PUBSPEC = r'''name: flutter_frontend_server - version: 0.0.1 - environment: - sdk: ">=2.2.2 <3.0.0" -@@ -87,7 +87,7 @@ dependencies: - PUBSPECS = { - 'vm': VM_PUBSPEC, - 'build_integration': BUILD_INTEGRATION_PUBSPEC, -- 'frontend_server': FRONTEND_SERVER_PUBSPEC, -+ 'flutter_frontend_server': FLUTTER_FRONTEND_SERVER_PUBSPEC, - 'kernel': KERNEL_PUBSPEC, - 'front_end': FRONT_END_PUBSPEC, - 'dev_compiler': DEV_COMPILER_PUBSPEC, -@@ -103,7 +103,7 @@ def main(): - for package in PACKAGES: - base = args.input - # Handle different path for frontend_server -- if package == 'frontend_server': -+ if package == 'flutter_frontend_server': - base = args.frontend - package_root = os.path.join(base, package) - for root, directories, files in os.walk(package_root): -diff --git a/frontend_server/pubspec.yaml b/flutter_frontend_server/pubspec.yaml -similarity index 100% -rename from frontend_server/pubspec.yaml -rename to flutter_frontend_server/pubspec.yaml -diff --git a/frontend_server/BUILD.gn b/frontend_server/BUILD.gn -index 330f1e394..6cb8ce88f 100644 ---- a/frontend_server/BUILD.gn -+++ b/frontend_server/BUILD.gn -@@ -6,9 +6,9 @@ if (is_fuchsia_host || is_fuchsia) { - import("//build/dart/dart_library.gni") - import("//build/dart/dart_tool.gni") - -- dart_library("frontend_server") { -+ dart_library("flutter_frontend_server") { - disable_analysis = true -- package_name = "frontend_server" -+ package_name = "flutter_frontend_server" - - sources = [ - "server.dart", -@@ -19,6 +19,7 @@ if (is_fuchsia_host || is_fuchsia) { - "//third_party/dart-pkg/pub/path", - "//third_party/dart-pkg/pub/usage", - "//third_party/dart/pkg/build_integration", -+ "//third_party/dart/pkg/frontend_server", - "//third_party/dart/pkg/front_end", - "//third_party/dart/pkg/kernel", - "//third_party/dart/pkg/vm", -@@ -27,72 +28,15 @@ if (is_fuchsia_host || is_fuchsia) { - - dart_tool("frontend_server_tool") { - main_dart = "bin/starter.dart" -- source_dir = "." -+ source_dir = "../flutter_frontend_server" - disable_analysis = true - output_name = "frontend_server" - - sources = [] - - deps = [ -- ":frontend_server", -- ] -- } --} else { -- import("//third_party/dart/utils/application_snapshot.gni") -- -- frontend_server_files = -- exec_script("//third_party/dart/tools/list_dart_files.py", -- [ -- "absolute", -- rebase_path("."), -- ], -- "list lines") -- -- frontend_server_files += -- exec_script("//third_party/dart/tools/list_dart_files.py", -- [ -- "absolute", -- rebase_path("../../third_party/dart/pkg"), -- ], -- "list lines") -- -- application_snapshot("frontend_server") { -- main_dart = "bin/starter.dart" -- deps = [ -- ":package_incremental_compiler", -- "$flutter_root/lib/snapshot:kernel_platform_files", -- ] -- dot_packages = rebase_path(".packages") -- flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk") -- training_args = [ -- "--train", -- "--sdk-root=$flutter_patched_sdk", -- rebase_path(main_dart), -- ] -- -- inputs = frontend_server_files -- } -- -- # For flutter/flutter#36738 we make the source files available so that -- # we can generate a local frontend_server snapshot in the tools cache. -- action("package_incremental_compiler") { -- script = "$flutter_root/frontend_server/package_incremental.py" -- -- inputs = frontend_server_files -- -- outputs = [ -- "$root_gen_dir/dart-pkg/frontend_server/pubspec.yaml", -- "$root_gen_dir/dart-pkg/vm/pubspec.yaml", -- "$root_gen_dir/dart-pkg/build_integration/pubspec.yaml", -- "$root_gen_dir/dart-pkg/front_end/pubspec.yaml", -- "$root_gen_dir/dart-pkg/kernel/pubspec.yaml", -- "$root_gen_dir/dart-pkg/dev_compiler/pubspec.yaml", -- ] -- -- args = [ -- "--input-root=" + rebase_path("//third_party/dart/pkg"), -- "--output-root=" + rebase_path("$root_gen_dir/dart-pkg"), -- "--frontend-server=" + rebase_path("$flutter_root"), -+ ":flutter_frontend_server", - ] - } - } -+ -diff --git a/tools/generate_package_files.py b/tools/generate_package_files.py -index 13399b126..1eb1e6f6c 100644 ---- a/tools/generate_package_files.py -+++ b/tools/generate_package_files.py -@@ -10,7 +10,7 @@ import os - import shutil - - ALL_PACKAGES = { -- 'frontend_server': [], -+ 'flutter_frontend_server': [], - } - - SRC_DIR = os.getcwd() --- -2.23.0.581.g78d2f28ef7-goog - diff --git a/tools/patches/flutter-engine/a61c775db81ef2a389d5aee6236176362b082d58.patch b/tools/patches/flutter-engine/a61c775db81ef2a389d5aee6236176362b082d58.patch deleted file mode 100644 index 8e96c95b0e0..00000000000 --- a/tools/patches/flutter-engine/a61c775db81ef2a389d5aee6236176362b082d58.patch +++ /dev/null @@ -1,613 +0,0 @@ -diff --git a/runtime/dart_isolate.cc b/runtime/dart_isolate.cc -index 2db8ae2c7cd5..dcbe05f66691 100644 ---- a/runtime/dart_isolate.cc -+++ b/runtime/dart_isolate.cc -@@ -32,7 +32,6 @@ namespace flutter { - std::weak_ptr DartIsolate::CreateRootIsolate( - const Settings& settings, - fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot, - TaskRunners task_runners, - std::unique_ptr window, - fml::WeakPtr io_manager, -@@ -58,7 +57,6 @@ std::weak_ptr DartIsolate::CreateRootIsolate( - std::shared_ptr(new DartIsolate( - settings, // settings - std::move(isolate_snapshot), // isolate snapshot -- std::move(shared_snapshot), // shared snapshot - task_runners, // task runners - std::move(io_manager), // IO manager - std::move(image_decoder), // Image Decoder -@@ -102,7 +100,6 @@ std::weak_ptr DartIsolate::CreateRootIsolate( - - DartIsolate::DartIsolate(const Settings& settings, - fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot, - TaskRunners task_runners, - fml::WeakPtr io_manager, - fml::WeakPtr image_decoder, -@@ -123,7 +120,6 @@ DartIsolate::DartIsolate(const Settings& settings, - DartVMRef::GetIsolateNameServer()), - settings_(settings), - isolate_snapshot_(std::move(isolate_snapshot)), -- shared_snapshot_(std::move(shared_snapshot)), - child_isolate_preparer_(std::move(child_isolate_preparer)), - isolate_create_callback_(isolate_create_callback), - isolate_shutdown_callback_(isolate_shutdown_callback) { -@@ -592,7 +588,6 @@ Dart_Isolate DartIsolate::DartCreateAndStartServiceIsolate( - DartIsolate::CreateRootIsolate( - vm_data->GetSettings(), // settings - vm_data->GetIsolateSnapshot(), // isolate snapshot -- vm_data->GetSharedSnapshot(), // shared snapshot - null_task_runners, // task runners - nullptr, // window - {}, // IO Manager -@@ -705,7 +700,6 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair( - std::shared_ptr(new DartIsolate( - (*raw_embedder_isolate)->GetSettings(), // settings - (*raw_embedder_isolate)->GetIsolateSnapshot(), // isolate_snapshot -- (*raw_embedder_isolate)->GetSharedSnapshot(), // shared_snapshot - null_task_runners, // task_runners - fml::WeakPtr{}, // io_manager - fml::WeakPtr{}, // io_manager -@@ -724,9 +718,7 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair( - advisory_script_uri, // - advisory_script_entrypoint, // - (*embedder_isolate)->GetIsolateSnapshot()->GetDataMapping(), -- (*embedder_isolate)->GetIsolateSnapshot()->GetInstructionsMapping(), -- (*embedder_isolate)->GetSharedSnapshot()->GetDataMapping(), -- (*embedder_isolate)->GetSharedSnapshot()->GetInstructionsMapping(), flags, -+ (*embedder_isolate)->GetIsolateSnapshot()->GetInstructionsMapping(), flags, - embedder_isolate.get(), // isolate_group_data - embedder_isolate.get(), // isolate_group - error); -@@ -791,10 +783,6 @@ fml::RefPtr DartIsolate::GetIsolateSnapshot() const { - return isolate_snapshot_; - } - --fml::RefPtr DartIsolate::GetSharedSnapshot() const { -- return shared_snapshot_; --} -- - std::weak_ptr DartIsolate::GetWeakIsolatePtr() { - return std::static_pointer_cast(shared_from_this()); - } -diff --git a/runtime/dart_isolate.h b/runtime/dart_isolate.h -index e7ab9b30243c..2abaa11fe011 100644 ---- a/runtime/dart_isolate.h -+++ b/runtime/dart_isolate.h -@@ -143,10 +143,6 @@ class DartIsolate : public UIDartState { - /// usually obtained from the - /// DartVMData associated with the - /// running Dart VM instance. -- /// @param[in] shared_snapshot The shared snapshot. This is -- /// usually obtained from the -- /// DartVMData associated with the -- /// running Dart VM instance. - /// @param[in] task_runners The task runners used by the - /// isolate. Via UI bindings, the - /// isolate will use the IO task -@@ -192,7 +188,6 @@ class DartIsolate : public UIDartState { - static std::weak_ptr CreateRootIsolate( - const Settings& settings, - fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot, - TaskRunners task_runners, - std::unique_ptr window, - fml::WeakPtr io_manager, -@@ -385,14 +380,6 @@ class DartIsolate : public UIDartState { - /// - fml::RefPtr GetIsolateSnapshot() const; - -- //---------------------------------------------------------------------------- -- /// @brief Get the shared snapshot used to launch this isolate. This is -- /// referenced by any child isolates launched by the root isolate. -- /// -- /// @return The shared snapshot. -- /// -- fml::RefPtr GetSharedSnapshot() const; -- - //---------------------------------------------------------------------------- - /// @brief A weak pointer to the Dart isolate instance. This instance may - /// only be used on the task runner that created the root isolate. -@@ -428,7 +415,6 @@ class DartIsolate : public UIDartState { - Phase phase_ = Phase::Unknown; - const Settings settings_; - const fml::RefPtr isolate_snapshot_; -- const fml::RefPtr shared_snapshot_; - std::vector> kernel_buffers_; - std::vector> shutdown_callbacks_; - ChildIsolatePreparer child_isolate_preparer_ = nullptr; -@@ -438,7 +424,6 @@ class DartIsolate : public UIDartState { - - DartIsolate(const Settings& settings, - fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot, - TaskRunners task_runners, - fml::WeakPtr io_manager, - fml::WeakPtr image_decoder, -diff --git a/runtime/dart_isolate_unittests.cc b/runtime/dart_isolate_unittests.cc -index 83a140737324..4d860f82d781 100644 ---- a/runtime/dart_isolate_unittests.cc -+++ b/runtime/dart_isolate_unittests.cc -@@ -38,7 +38,6 @@ TEST_F(DartIsolateTest, RootIsolateCreationAndShutdown) { - auto weak_isolate = DartIsolate::CreateRootIsolate( - vm_data->GetSettings(), // settings - vm_data->GetIsolateSnapshot(), // isolate snapshot -- vm_data->GetSharedSnapshot(), // shared snapshot - std::move(task_runners), // task runners - nullptr, // window - {}, // io manager -@@ -71,7 +70,6 @@ TEST_F(DartIsolateTest, IsolateShutdownCallbackIsInIsolateScope) { - auto weak_isolate = DartIsolate::CreateRootIsolate( - vm_data->GetSettings(), // settings - vm_data->GetIsolateSnapshot(), // isolate snapshot -- vm_data->GetSharedSnapshot(), // shared snapshot - std::move(task_runners), // task runners - nullptr, // window - {}, // io manager -@@ -181,7 +179,6 @@ static void RunDartCodeInIsolate(DartVMRef& vm_ref, - auto weak_isolate = DartIsolate::CreateRootIsolate( - vm_data->GetSettings(), // settings - vm_data->GetIsolateSnapshot(), // isolate snapshot -- vm_data->GetSharedSnapshot(), // shared snapshot - std::move(task_runners), // task runners - nullptr, // window - {}, // io manager -diff --git a/runtime/dart_lifecycle_unittests.cc b/runtime/dart_lifecycle_unittests.cc -index 7a607b7be26f..7a35c96167e5 100644 ---- a/runtime/dart_lifecycle_unittests.cc -+++ b/runtime/dart_lifecycle_unittests.cc -@@ -53,7 +53,6 @@ static std::shared_ptr CreateAndRunRootIsolate( - auto isolate_weak = DartIsolate::CreateRootIsolate( - vm.GetSettings(), // settings - vm.GetIsolateSnapshot(), // isolate_snapshot -- vm.GetSharedSnapshot(), // shared_snapshot - runners, // task_runners - {}, // window - {}, // io_manager -diff --git a/runtime/dart_snapshot.cc b/runtime/dart_snapshot.cc -index acebcd3493d8..a5df79bb136c 100644 ---- a/runtime/dart_snapshot.cc -+++ b/runtime/dart_snapshot.cc -@@ -181,10 +181,6 @@ fml::RefPtr DartSnapshot::IsolateSnapshotFromSettings( - return nullptr; - } - --fml::RefPtr DartSnapshot::Empty() { -- return fml::MakeRefCounted(nullptr, nullptr); --} -- - DartSnapshot::DartSnapshot(std::shared_ptr data, - std::shared_ptr instructions) - : data_(std::move(data)), instructions_(std::move(instructions)) {} -diff --git a/runtime/dart_snapshot.h b/runtime/dart_snapshot.h -index 162710ff2a6a..97038aac4aee 100644 ---- a/runtime/dart_snapshot.h -+++ b/runtime/dart_snapshot.h -@@ -102,17 +102,6 @@ class DartSnapshot : public fml::RefCountedThreadSafe { - static fml::RefPtr IsolateSnapshotFromSettings( - const Settings& settings); - -- //---------------------------------------------------------------------------- -- /// @brief An empty an invalid snapshot. This is used as a placeholder -- /// for certain optional snapshots. -- /// -- /// @bug Now that shared snapshots are no longer required, consider -- /// removing this constructor. -- /// -- /// @return An invalid empty snapshot. -- /// -- static fml::RefPtr Empty(); -- - //---------------------------------------------------------------------------- - /// @brief Determines if this snapshot contains a heap component. Since - /// the instructions component is optional, the method does not -diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc -index 37f8e690f737..0c18ba8da702 100644 ---- a/runtime/dart_vm.cc -+++ b/runtime/dart_vm.cc -@@ -232,12 +232,10 @@ std::shared_ptr DartVM::Create( - Settings settings, - fml::RefPtr vm_snapshot, - fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot, - std::shared_ptr isolate_name_server) { - auto vm_data = DartVMData::Create(settings, // - std::move(vm_snapshot), // -- std::move(isolate_snapshot), // -- std::move(shared_snapshot) // -+ std::move(isolate_snapshot) // - ); - - if (!vm_data) { -diff --git a/runtime/dart_vm.h b/runtime/dart_vm.h -index 40b8dc4a242e..ac84fe77020d 100644 ---- a/runtime/dart_vm.h -+++ b/runtime/dart_vm.h -@@ -162,7 +162,6 @@ class DartVM { - Settings settings, - fml::RefPtr vm_snapshot, - fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot, - std::shared_ptr isolate_name_server); - - DartVM(std::shared_ptr data, -diff --git a/runtime/dart_vm_data.cc b/runtime/dart_vm_data.cc -index e14c998daa74..b93d9ba9ad03 100644 ---- a/runtime/dart_vm_data.cc -+++ b/runtime/dart_vm_data.cc -@@ -9,8 +9,7 @@ namespace flutter { - std::shared_ptr DartVMData::Create( - Settings settings, - fml::RefPtr vm_snapshot, -- fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot) { -+ fml::RefPtr isolate_snapshot) { - if (!vm_snapshot || !vm_snapshot->IsValid()) { - // Caller did not provide a valid VM snapshot. Attempt to infer one - // from the settings. -@@ -33,30 +32,19 @@ std::shared_ptr DartVMData::Create( - } - } - -- if (!shared_snapshot || !shared_snapshot->IsValid()) { -- shared_snapshot = DartSnapshot::Empty(); -- if (!shared_snapshot) { -- FML_LOG(ERROR) << "Shared snapshot invalid."; -- return {}; -- } -- } -- - return std::shared_ptr(new DartVMData( - std::move(settings), // - std::move(vm_snapshot), // -- std::move(isolate_snapshot), // -- std::move(shared_snapshot) // -+ std::move(isolate_snapshot) // - )); - } - - DartVMData::DartVMData(Settings settings, - fml::RefPtr vm_snapshot, -- fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot) -+ fml::RefPtr isolate_snapshot) - : settings_(settings), - vm_snapshot_(vm_snapshot), -- isolate_snapshot_(isolate_snapshot), -- shared_snapshot_(shared_snapshot) {} -+ isolate_snapshot_(isolate_snapshot) {} - - DartVMData::~DartVMData() = default; - -@@ -72,8 +60,4 @@ fml::RefPtr DartVMData::GetIsolateSnapshot() const { - return isolate_snapshot_; - } - --fml::RefPtr DartVMData::GetSharedSnapshot() const { -- return shared_snapshot_; --} -- - } // namespace flutter -diff --git a/runtime/dart_vm_data.h b/runtime/dart_vm_data.h -index 95c4565e2ef7..0f054bf55f3d 100644 ---- a/runtime/dart_vm_data.h -+++ b/runtime/dart_vm_data.h -@@ -15,8 +15,7 @@ class DartVMData { - static std::shared_ptr Create( - Settings settings, - fml::RefPtr vm_snapshot, -- fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot); -+ fml::RefPtr isolate_snapshot); - - ~DartVMData(); - -@@ -26,18 +25,14 @@ class DartVMData { - - fml::RefPtr GetIsolateSnapshot() const; - -- fml::RefPtr GetSharedSnapshot() const; -- - private: - const Settings settings_; - const fml::RefPtr vm_snapshot_; - const fml::RefPtr isolate_snapshot_; -- const fml::RefPtr shared_snapshot_; - - DartVMData(Settings settings, - fml::RefPtr vm_snapshot, -- fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot); -+ fml::RefPtr isolate_snapshot); - - FML_DISALLOW_COPY_AND_ASSIGN(DartVMData); - }; -diff --git a/runtime/dart_vm_lifecycle.cc b/runtime/dart_vm_lifecycle.cc -index 717a0546a280..41a3da606abb 100644 ---- a/runtime/dart_vm_lifecycle.cc -+++ b/runtime/dart_vm_lifecycle.cc -@@ -43,8 +43,7 @@ DartVMRef::~DartVMRef() { - - DartVMRef DartVMRef::Create(Settings settings, - fml::RefPtr vm_snapshot, -- fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot) { -+ fml::RefPtr isolate_snapshot) { - std::scoped_lock lifecycle_lock(gVMMutex); - - if (!settings.leak_vm) { -@@ -78,7 +77,6 @@ DartVMRef DartVMRef::Create(Settings settings, - auto vm = DartVM::Create(std::move(settings), // - std::move(vm_snapshot), // - std::move(isolate_snapshot), // -- std::move(shared_snapshot), // - isolate_name_server // - ); - -diff --git a/runtime/dart_vm_lifecycle.h b/runtime/dart_vm_lifecycle.h -index 5ce6cf7a5777..d89b6d7cb43d 100644 ---- a/runtime/dart_vm_lifecycle.h -+++ b/runtime/dart_vm_lifecycle.h -@@ -29,8 +29,7 @@ class DartVMRef { - FML_WARN_UNUSED_RESULT - static DartVMRef Create(Settings settings, - fml::RefPtr vm_snapshot = nullptr, -- fml::RefPtr isolate_snapshot = nullptr, -- fml::RefPtr shared_snapshot = nullptr); -+ fml::RefPtr isolate_snapshot = nullptr); - - DartVMRef(DartVMRef&&); - -diff --git a/runtime/runtime_controller.cc b/runtime/runtime_controller.cc -index 61415ec4124c..a63843fedf66 100644 ---- a/runtime/runtime_controller.cc -+++ b/runtime/runtime_controller.cc -@@ -18,7 +18,6 @@ RuntimeController::RuntimeController( - RuntimeDelegate& p_client, - DartVM* p_vm, - fml::RefPtr p_isolate_snapshot, -- fml::RefPtr p_shared_snapshot, - TaskRunners p_task_runners, - fml::WeakPtr p_io_manager, - fml::WeakPtr p_image_decoder, -@@ -31,7 +30,6 @@ RuntimeController::RuntimeController( - : RuntimeController(p_client, - p_vm, - std::move(p_isolate_snapshot), -- std::move(p_shared_snapshot), - std::move(p_task_runners), - std::move(p_io_manager), - std::move(p_image_decoder), -@@ -47,7 +45,6 @@ RuntimeController::RuntimeController( - RuntimeDelegate& p_client, - DartVM* p_vm, - fml::RefPtr p_isolate_snapshot, -- fml::RefPtr p_shared_snapshot, - TaskRunners p_task_runners, - fml::WeakPtr p_io_manager, - fml::WeakPtr p_image_decoder, -@@ -61,7 +58,6 @@ RuntimeController::RuntimeController( - : client_(p_client), - vm_(p_vm), - isolate_snapshot_(std::move(p_isolate_snapshot)), -- shared_snapshot_(std::move(p_shared_snapshot)), - task_runners_(p_task_runners), - io_manager_(p_io_manager), - image_decoder_(p_image_decoder), -@@ -78,7 +74,6 @@ RuntimeController::RuntimeController( - auto strong_root_isolate = - DartIsolate::CreateRootIsolate(vm_->GetVMData()->GetSettings(), // - isolate_snapshot_, // -- shared_snapshot_, // - task_runners_, // - std::make_unique(this), // - io_manager_, // -@@ -139,7 +134,6 @@ std::unique_ptr RuntimeController::Clone() const { - client_, // - vm_, // - isolate_snapshot_, // -- shared_snapshot_, // - task_runners_, // - io_manager_, // - image_decoder_, // -diff --git a/runtime/runtime_controller.h b/runtime/runtime_controller.h -index 665f0e17dbb5..98a87f6f5d09 100644 ---- a/runtime/runtime_controller.h -+++ b/runtime/runtime_controller.h -@@ -32,7 +32,6 @@ class RuntimeController final : public WindowClient { - RuntimeDelegate& client, - DartVM* vm, - fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot, - TaskRunners task_runners, - fml::WeakPtr io_manager, - fml::WeakPtr iamge_decoder, -@@ -128,7 +127,6 @@ class RuntimeController final : public WindowClient { - RuntimeDelegate& client_; - DartVM* const vm_; - fml::RefPtr isolate_snapshot_; -- fml::RefPtr shared_snapshot_; - TaskRunners task_runners_; - fml::WeakPtr io_manager_; - fml::WeakPtr image_decoder_; -@@ -146,7 +144,6 @@ class RuntimeController final : public WindowClient { - RuntimeDelegate& client, - DartVM* vm, - fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot, - TaskRunners task_runners, - fml::WeakPtr io_manager, - fml::WeakPtr image_decoder, -diff --git a/shell/common/engine.cc b/shell/common/engine.cc -index fd424a369eeb..7ad3a432a52c 100644 ---- a/shell/common/engine.cc -+++ b/shell/common/engine.cc -@@ -39,7 +39,6 @@ Engine::Engine(Delegate& delegate, - const PointerDataDispatcherMaker& dispatcher_maker, - DartVM& vm, - fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot, - TaskRunners task_runners, - Settings settings, - std::unique_ptr animator, -@@ -61,7 +60,6 @@ Engine::Engine(Delegate& delegate, - *this, // runtime delegate - &vm, // VM - std::move(isolate_snapshot), // isolate snapshot -- std::move(shared_snapshot), // shared snapshot - task_runners_, // task runners - std::move(io_manager), // io manager - image_decoder_.GetWeakPtr(), // image decoder -diff --git a/shell/common/engine.h b/shell/common/engine.h -index 2e4fd41964bb..dde92dbc6d26 100644 ---- a/shell/common/engine.h -+++ b/shell/common/engine.h -@@ -249,8 +249,6 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate { - /// created when the engine is created. This - /// requires access to the isolate snapshot - /// upfront. -- /// @param[in] shared_snapshot The portion of the isolate snapshot shared -- /// among multiple isolates. - // TODO(chinmaygarde): This is probably redundant now that the IO manager is - // it's own object. - /// @param[in] task_runners The task runners used by the shell that -@@ -276,7 +274,6 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate { - const PointerDataDispatcherMaker& dispatcher_maker, - DartVM& vm, - fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot, - TaskRunners task_runners, - Settings settings, - std::unique_ptr animator, -diff --git a/shell/common/shell.cc b/shell/common/shell.cc -index bf185a6b3661..fbc2457d56bd 100644 ---- a/shell/common/shell.cc -+++ b/shell/common/shell.cc -@@ -45,7 +45,6 @@ std::unique_ptr Shell::CreateShellOnPlatformThread( - TaskRunners task_runners, - Settings settings, - fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot, - Shell::CreateCallback on_create_platform_view, - Shell::CreateCallback on_create_rasterizer) { - if (!task_runners.IsValid()) { -@@ -124,7 +123,6 @@ std::unique_ptr Shell::CreateShellOnPlatformThread( - shell = shell.get(), // - &dispatcher_maker, // - isolate_snapshot = std::move(isolate_snapshot), // -- shared_snapshot = std::move(shared_snapshot), // - vsync_waiter = std::move(vsync_waiter), // - &weak_io_manager_future // - ]() mutable { -@@ -141,7 +139,6 @@ std::unique_ptr Shell::CreateShellOnPlatformThread( - dispatcher_maker, // - *shell->GetDartVM(), // - std::move(isolate_snapshot), // -- std::move(shared_snapshot), // - task_runners, // - shell->GetSettings(), // - std::move(animator), // -@@ -227,7 +224,6 @@ std::unique_ptr Shell::Create( - return Shell::Create(std::move(task_runners), // - std::move(settings), // - vm_data->GetIsolateSnapshot(), // isolate snapshot -- DartSnapshot::Empty(), // shared snapshot - std::move(on_create_platform_view), // - std::move(on_create_rasterizer), // - std::move(vm) // -@@ -238,7 +234,6 @@ std::unique_ptr Shell::Create( - TaskRunners task_runners, - Settings settings, - fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot, - Shell::CreateCallback on_create_platform_view, - Shell::CreateCallback on_create_rasterizer, - DartVMRef vm) { -@@ -262,7 +257,6 @@ std::unique_ptr Shell::Create( - task_runners = std::move(task_runners), // - settings, // - isolate_snapshot = std::move(isolate_snapshot), // -- shared_snapshot = std::move(shared_snapshot), // - on_create_platform_view, // - on_create_rasterizer // - ]() mutable { -@@ -270,7 +264,6 @@ std::unique_ptr Shell::Create( - std::move(task_runners), // - settings, // - std::move(isolate_snapshot), // -- std::move(shared_snapshot), // - on_create_platform_view, // - on_create_rasterizer // - ); -diff --git a/shell/common/shell.h b/shell/common/shell.h -index e4ee6960389a..cc3ed8fdc448 100644 ---- a/shell/common/shell.h -+++ b/shell/common/shell.h -@@ -139,9 +139,6 @@ class Shell final : public PlatformView::Delegate, - /// @param[in] isolate_snapshot A custom isolate snapshot. Takes - /// precedence over any snapshots - /// specified in the settings. -- /// @param[in] shared_snapshot A custom shared snapshot. Takes -- /// precedence over any snapshots -- /// specified in the settings. - /// @param[in] on_create_platform_view The callback that must return a - /// platform view. This will be called on - /// the platform task runner before this -@@ -164,7 +161,6 @@ class Shell final : public PlatformView::Delegate, - TaskRunners task_runners, - Settings settings, - fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot, - CreateCallback on_create_platform_view, - CreateCallback on_create_rasterizer, - DartVMRef vm); -@@ -375,7 +371,6 @@ class Shell final : public PlatformView::Delegate, - TaskRunners task_runners, - Settings settings, - fml::RefPtr isolate_snapshot, -- fml::RefPtr shared_snapshot, - Shell::CreateCallback on_create_platform_view, - Shell::CreateCallback on_create_rasterizer); - -diff --git a/shell/platform/fuchsia/dart_runner/dart_component_controller.cc b/shell/platform/fuchsia/dart_runner/dart_component_controller.cc -index 37cef7bce6f7..e5bd774fc4e3 100644 ---- a/shell/platform/fuchsia/dart_runner/dart_component_controller.cc -+++ b/shell/platform/fuchsia/dart_runner/dart_component_controller.cc -@@ -314,8 +314,7 @@ bool DartComponentController::CreateIsolate( - - isolate_ = Dart_CreateIsolateGroup( - url_.c_str(), label_.c_str(), isolate_snapshot_data, -- isolate_snapshot_instructions, nullptr /* shared_snapshot_data */, -- nullptr /* shared_snapshot_instructions */, nullptr /* flags */, state, -+ isolate_snapshot_instructions, nullptr /* flags */, state, - state, &error); - if (!isolate_) { - FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolateGroup failed: %s", error); -diff --git a/shell/platform/fuchsia/dart_runner/service_isolate.cc b/shell/platform/fuchsia/dart_runner/service_isolate.cc -index d22c4df286b6..40719ab81c94 100644 ---- a/shell/platform/fuchsia/dart_runner/service_isolate.cc -+++ b/shell/platform/fuchsia/dart_runner/service_isolate.cc -@@ -107,8 +107,7 @@ Dart_Isolate CreateServiceIsolate(const char* uri, - Dart_Isolate isolate = Dart_CreateIsolateGroup( - uri, DART_VM_SERVICE_ISOLATE_NAME, mapped_isolate_snapshot_data.address(), - mapped_isolate_snapshot_instructions.address(), -- nullptr /* shared_snapshot_data */, -- nullptr /* shared_snapshot_instructions */, nullptr /* flags */, state, -+ nullptr /* flags */, state, - state, error); - if (!isolate) { - FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolateGroup failed: %s", *error); -diff --git a/shell/platform/fuchsia/flutter/engine.cc b/shell/platform/fuchsia/flutter/engine.cc -index 75dbf497b8d8..d002049996df 100644 ---- a/shell/platform/fuchsia/flutter/engine.cc -+++ b/shell/platform/fuchsia/flutter/engine.cc -@@ -227,7 +227,6 @@ Engine::Engine(Delegate& delegate, - task_runners, // host task runners - settings_, // shell launch settings - std::move(isolate_snapshot), // isolate snapshot -- flutter::DartSnapshot::Empty(), // shared snapshot - on_create_platform_view, // platform view create callback - on_create_rasterizer, // rasterizer create callback - std::move(vm) // vm reference diff --git a/tools/patches/flutter-engine/b48c8b1d1c9050734c0491f4e36b7d61ef005233.patch b/tools/patches/flutter-engine/b48c8b1d1c9050734c0491f4e36b7d61ef005233.patch deleted file mode 100644 index 1e357debaa4..00000000000 --- a/tools/patches/flutter-engine/b48c8b1d1c9050734c0491f4e36b7d61ef005233.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/frontend_server/lib/server.dart b/frontend_server/lib/server.dart -index 44a3d69b9..9620a5de0 100644 ---- a/frontend_server/lib/server.dart -+++ b/frontend_server/lib/server.dart -@@ -85,11 +85,6 @@ Future starter( - StringSink output, - }) async { - ArgResults options; -- frontend.argParser -- ..addFlag('track-widget-creation', -- help: 'Run a kernel transformer to track creation locations for widgets.', -- defaultsTo: false); -- - try { - options = frontend.argParser.parse(args); - } catch (error) { diff --git a/tools/patches/flutter-engine/cb80ea7ba9124fd42a34c1d021232113e20d21b1.patch b/tools/patches/flutter-engine/cb80ea7ba9124fd42a34c1d021232113e20d21b1.patch deleted file mode 100644 index 6151279fb43..00000000000 --- a/tools/patches/flutter-engine/cb80ea7ba9124fd42a34c1d021232113e20d21b1.patch +++ /dev/null @@ -1,1305 +0,0 @@ -diff --git a/lib/snapshot/libraries.json b/lib/snapshot/libraries.json -index b6ffcef58..c4783158b 100644 ---- a/lib/snapshot/libraries.json -+++ b/lib/snapshot/libraries.json -@@ -4,69 +4,69 @@ - "flutter": { - "libraries": { - "_builtin": { -- "uri": "../../../third_party/dart/runtime/bin/builtin.dart" -+ "uri": "../../../third_party/dart/sdk/lib/_internal/vm/bin/builtin.dart" - }, - "core": { - "patches": [ -- "../../../third_party/dart/runtime/lib/core_patch.dart", -- "../../../third_party/dart/runtime/lib/array.dart", -- "../../../third_party/dart/runtime/lib/array_patch.dart", -- "../../../third_party/dart/runtime/lib/bigint_patch.dart", -- "../../../third_party/dart/runtime/lib/bool_patch.dart", -- "../../../third_party/dart/runtime/lib/date_patch.dart", -- "../../../third_party/dart/runtime/lib/double.dart", -- "../../../third_party/dart/runtime/lib/double_patch.dart", -- "../../../third_party/dart/runtime/lib/errors_patch.dart", -- "../../../third_party/dart/runtime/lib/expando_patch.dart", -- "../../../third_party/dart/runtime/lib/function.dart", -- "../../../third_party/dart/runtime/lib/function_patch.dart", -- "../../../third_party/dart/runtime/lib/growable_array.dart", -- "../../../third_party/dart/runtime/lib/identical_patch.dart", -- "../../../third_party/dart/runtime/lib/immutable_map.dart", -- "../../../third_party/dart/runtime/lib/integers.dart", -- "../../../third_party/dart/runtime/lib/integers_patch.dart", -- "../../../third_party/dart/runtime/lib/invocation_mirror_patch.dart", -- "../../../third_party/dart/runtime/lib/lib_prefix.dart", -- "../../../third_party/dart/runtime/lib/map_patch.dart", -- "../../../third_party/dart/runtime/lib/null_patch.dart", -- "../../../third_party/dart/runtime/lib/object_patch.dart", -- "../../../third_party/dart/runtime/lib/regexp_patch.dart", -- "../../../third_party/dart/runtime/lib/stacktrace.dart", -- "../../../third_party/dart/runtime/lib/stopwatch_patch.dart", -- "../../../third_party/dart/runtime/lib/string_buffer_patch.dart", -- "../../../third_party/dart/runtime/lib/string_patch.dart", -- "../../../third_party/dart/runtime/lib/type_patch.dart", -- "../../../third_party/dart/runtime/lib/uri_patch.dart", -- "../../../third_party/dart/runtime/lib/weak_property.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/core_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/array.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/array_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/bigint_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/bool_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/date_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/double.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/double_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/errors_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/expando_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/function.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/function_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/growable_array.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/identical_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/immutable_map.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/integers.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/integers_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/invocation_mirror_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/lib_prefix.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/map_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/null_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/object_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/regexp_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/stacktrace.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/stopwatch_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/string_buffer_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/string_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/type_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/uri_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/weak_property.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/core/core.dart" - }, - "async": { - "patches": [ -- "../../../third_party/dart/runtime/lib/async_patch.dart", -- "../../../third_party/dart/runtime/lib/deferred_load_patch.dart", -- "../../../third_party/dart/runtime/lib/schedule_microtask_patch.dart", -- "../../../third_party/dart/runtime/lib/timer_patch.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/async_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/deferred_load_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/schedule_microtask_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_patch.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/async/async.dart" - }, - "collection": { - "patches": [ -- "../../../third_party/dart/runtime/lib/collection_patch.dart", -- "../../../third_party/dart/runtime/lib/compact_hash.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/collection_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/compact_hash.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/collection/collection.dart" - }, - "ffi": { - "patches": [ -- "../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart", -- "../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart", -- "../../../third_party/dart/runtime/lib/ffi_patch.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_type_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_patch.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/ffi/ffi.dart" - }, - "typed_data": { -- "patches": "../../../third_party/dart/runtime/lib/typed_data_patch.dart", -+ "patches": "../../../third_party/dart/sdk/lib/_internal/vm/lib/typed_data_patch.dart", - "uri": "../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" - }, - "nativewrappers": { -@@ -74,24 +74,24 @@ - }, - "mirrors": { - "patches": [ -- "../../../third_party/dart/runtime/lib/mirrors_patch.dart", -- "../../../third_party/dart/runtime/lib/mirrors_impl.dart", -- "../../../third_party/dart/runtime/lib/mirror_reference.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_impl.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/mirror_reference.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - }, - "developer": { - "patches": [ -- "../../../third_party/dart/runtime/lib/developer.dart", -- "../../../third_party/dart/runtime/lib/profiler.dart", -- "../../../third_party/dart/runtime/lib/timeline.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/developer.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/profiler.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/timeline.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/developer/developer.dart" - }, - "isolate": { - "patches": [ -- "../../../third_party/dart/runtime/lib/isolate_patch.dart", -- "../../../third_party/dart/runtime/lib/timer_impl.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/isolate_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_impl.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/isolate/isolate.dart" - }, -@@ -100,48 +100,48 @@ - }, - "wasm": { - "patches": [ -- "../../../third_party/dart/runtime/lib/wasm_patch.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/wasm_patch.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/wasm/wasm.dart" - }, - "io": { - "patches": [ -- "../../../third_party/dart/runtime/bin/common_patch.dart", -- "../../../third_party/dart/runtime/bin/directory_patch.dart", -- "../../../third_party/dart/runtime/bin/eventhandler_patch.dart", -- "../../../third_party/dart/runtime/bin/file_patch.dart", -- "../../../third_party/dart/runtime/bin/file_system_entity_patch.dart", -- "../../../third_party/dart/runtime/bin/filter_patch.dart", -- "../../../third_party/dart/runtime/bin/io_service_patch.dart", -- "../../../third_party/dart/runtime/bin/namespace_patch.dart", -- "../../../third_party/dart/runtime/bin/platform_patch.dart", -- "../../../third_party/dart/runtime/bin/process_patch.dart", -- "../../../third_party/dart/runtime/bin/socket_patch.dart", -- "../../../third_party/dart/runtime/bin/stdio_patch.dart", -- "../../../third_party/dart/runtime/bin/secure_socket_patch.dart", -- "../../../third_party/dart/runtime/bin/sync_socket_patch.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/common_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/directory_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/eventhandler_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/file_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/file_system_entity_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/filter_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/io_service_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/namespace_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/platform_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/process_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/socket_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/stdio_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/secure_socket_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/sync_socket_patch.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/io/io.dart" - }, - "_internal": { - "patches": [ -- "../../../third_party/dart/runtime/lib/internal_patch.dart", -- "../../../third_party/dart/runtime/lib/class_id_fasta.dart", -- "../../../third_party/dart/runtime/lib/print_patch.dart", -- "../../../third_party/dart/runtime/lib/symbol_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/internal_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/class_id_fasta.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/print_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/symbol_patch.dart", - "../../../third_party/dart/sdk/lib/internal/patch.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/internal/internal.dart" - }, - "convert": { -- "patches": "../../../third_party/dart/runtime/lib/convert_patch.dart", -+ "patches": "../../../third_party/dart/sdk/lib/_internal/vm/lib/convert_patch.dart", - "uri": "../../../third_party/dart/sdk/lib/convert/convert.dart" - }, - "profiler": { - "uri": "../../../third_party/dart/sdk/lib/profiler/profiler.dart" - }, - "math": { -- "patches": "../../../third_party/dart/runtime/lib/math_patch.dart", -+ "patches": "../../../third_party/dart/sdk/lib/_internal/vm/lib/math_patch.dart", - "uri": "../../../third_party/dart/sdk/lib/math/math.dart" - }, - "_http": { -diff --git a/lib/snapshot/libraries.yaml b/lib/snapshot/libraries.yaml -index 392e0500b..7269819f7 100644 ---- a/lib/snapshot/libraries.yaml -+++ b/lib/snapshot/libraries.yaml -@@ -14,87 +14,87 @@ - flutter: - libraries: - _builtin: -- uri: "../../../third_party/dart/runtime/bin/builtin.dart" -+ uri: "../../../third_party/dart/sdk/lib/_internal/vm/bin/builtin.dart" - - _internal: - uri: "../../../third_party/dart/sdk/lib/internal/internal.dart" - patches: -- - "../../../third_party/dart/runtime/lib/internal_patch.dart" -- - "../../../third_party/dart/runtime/lib/class_id_fasta.dart" -- - "../../../third_party/dart/runtime/lib/print_patch.dart" -- - "../../../third_party/dart/runtime/lib/symbol_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/internal_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/class_id_fasta.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/print_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/symbol_patch.dart" - - "../../../third_party/dart/sdk/lib/internal/patch.dart" - - async: - uri: "../../../third_party/dart/sdk/lib/async/async.dart" - patches: -- - "../../../third_party/dart/runtime/lib/async_patch.dart" -- - "../../../third_party/dart/runtime/lib/deferred_load_patch.dart" -- - "../../../third_party/dart/runtime/lib/schedule_microtask_patch.dart" -- - "../../../third_party/dart/runtime/lib/timer_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/async_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/deferred_load_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/schedule_microtask_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_patch.dart" - - collection: - uri: "../../../third_party/dart/sdk/lib/collection/collection.dart" - patches: -- - "../../../third_party/dart/runtime/lib/collection_patch.dart" -- - "../../../third_party/dart/runtime/lib/compact_hash.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/collection_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/compact_hash.dart" - - convert: - uri: "../../../third_party/dart/sdk/lib/convert/convert.dart" -- patches: "../../../third_party/dart/runtime/lib/convert_patch.dart" -+ patches: "../../../third_party/dart/sdk/lib/_internal/vm/lib/convert_patch.dart" - - core: - uri: "../../../third_party/dart/sdk/lib/core/core.dart" - patches: -- - "../../../third_party/dart/runtime/lib/core_patch.dart" -- - "../../../third_party/dart/runtime/lib/array.dart" -- - "../../../third_party/dart/runtime/lib/array_patch.dart" -- - "../../../third_party/dart/runtime/lib/bigint_patch.dart" -- - "../../../third_party/dart/runtime/lib/bool_patch.dart" -- - "../../../third_party/dart/runtime/lib/date_patch.dart" -- - "../../../third_party/dart/runtime/lib/double.dart" -- - "../../../third_party/dart/runtime/lib/double_patch.dart" -- - "../../../third_party/dart/runtime/lib/errors_patch.dart" -- - "../../../third_party/dart/runtime/lib/expando_patch.dart" -- - "../../../third_party/dart/runtime/lib/function.dart" -- - "../../../third_party/dart/runtime/lib/function_patch.dart" -- - "../../../third_party/dart/runtime/lib/growable_array.dart" -- - "../../../third_party/dart/runtime/lib/identical_patch.dart" -- - "../../../third_party/dart/runtime/lib/immutable_map.dart" -- - "../../../third_party/dart/runtime/lib/integers.dart" -- - "../../../third_party/dart/runtime/lib/integers_patch.dart" -- - "../../../third_party/dart/runtime/lib/invocation_mirror_patch.dart" -- - "../../../third_party/dart/runtime/lib/lib_prefix.dart" -- - "../../../third_party/dart/runtime/lib/map_patch.dart" -- - "../../../third_party/dart/runtime/lib/null_patch.dart" -- - "../../../third_party/dart/runtime/lib/object_patch.dart" -- - "../../../third_party/dart/runtime/lib/regexp_patch.dart" -- - "../../../third_party/dart/runtime/lib/stacktrace.dart" -- - "../../../third_party/dart/runtime/lib/stopwatch_patch.dart" -- - "../../../third_party/dart/runtime/lib/string_buffer_patch.dart" -- - "../../../third_party/dart/runtime/lib/string_patch.dart" -- - "../../../third_party/dart/runtime/lib/type_patch.dart" -- - "../../../third_party/dart/runtime/lib/uri_patch.dart" -- - "../../../third_party/dart/runtime/lib/weak_property.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/core_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/array.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/array_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/bigint_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/bool_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/date_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/double.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/double_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/errors_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/expando_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/function.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/function_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/growable_array.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/identical_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/immutable_map.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/integers.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/integers_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/invocation_mirror_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/lib_prefix.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/map_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/null_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/object_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/regexp_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/stacktrace.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/stopwatch_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/string_buffer_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/string_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/type_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/uri_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/weak_property.dart" - - developer: - uri: "../../../third_party/dart/sdk/lib/developer/developer.dart" - patches: -- - "../../../third_party/dart/runtime/lib/developer.dart" -- - "../../../third_party/dart/runtime/lib/profiler.dart" -- - "../../../third_party/dart/runtime/lib/timeline.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/developer.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/profiler.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/timeline.dart" - - ffi: - uri: "../../../third_party/dart/sdk/lib/ffi/ffi.dart" - patches: -- - "../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart" -- - "../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart" -- - "../../../third_party/dart/runtime/lib/ffi_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_type_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_patch.dart" - - wasm: - uri: "../../../third_party/dart/sdk/lib/wasm/wasm.dart" - patches: -- - "../../../third_party/dart/runtime/lib/wasm_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/wasm_patch.dart" - - _http: - uri: "../../../third_party/dart/sdk/lib/_http/http.dart" -@@ -102,37 +102,37 @@ flutter: - io: - uri: "../../../third_party/dart/sdk/lib/io/io.dart" - patches: -- - "../../../third_party/dart/runtime/bin/common_patch.dart" -- - "../../../third_party/dart/runtime/bin/directory_patch.dart" -- - "../../../third_party/dart/runtime/bin/eventhandler_patch.dart" -- - "../../../third_party/dart/runtime/bin/file_patch.dart" -- - "../../../third_party/dart/runtime/bin/file_system_entity_patch.dart" -- - "../../../third_party/dart/runtime/bin/filter_patch.dart" -- - "../../../third_party/dart/runtime/bin/io_service_patch.dart" -- - "../../../third_party/dart/runtime/bin/namespace_patch.dart" -- - "../../../third_party/dart/runtime/bin/platform_patch.dart" -- - "../../../third_party/dart/runtime/bin/process_patch.dart" -- - "../../../third_party/dart/runtime/bin/socket_patch.dart" -- - "../../../third_party/dart/runtime/bin/stdio_patch.dart" -- - "../../../third_party/dart/runtime/bin/secure_socket_patch.dart" -- - "../../../third_party/dart/runtime/bin/sync_socket_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/common_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/directory_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/eventhandler_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/file_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/file_system_entity_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/filter_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/io_service_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/namespace_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/platform_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/process_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/socket_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/stdio_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/secure_socket_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/sync_socket_patch.dart" - - isolate: - uri: "../../../third_party/dart/sdk/lib/isolate/isolate.dart" - patches: -- - "../../../third_party/dart/runtime/lib/isolate_patch.dart" -- - "../../../third_party/dart/runtime/lib/timer_impl.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/isolate_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_impl.dart" - - math: - uri: "../../../third_party/dart/sdk/lib/math/math.dart" -- patches: "../../../third_party/dart/runtime/lib/math_patch.dart" -+ patches: "../../../third_party/dart/sdk/lib/_internal/vm/lib/math_patch.dart" - - mirrors: - uri: "../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - patches: -- - "../../../third_party/dart/runtime/lib/mirrors_patch.dart" -- - "../../../third_party/dart/runtime/lib/mirrors_impl.dart" -- - "../../../third_party/dart/runtime/lib/mirror_reference.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_impl.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/mirror_reference.dart" - - nativewrappers: - uri: "../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart" -@@ -142,7 +142,7 @@ flutter: - - typed_data: - uri: "../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" -- patches: "../../../third_party/dart/runtime/lib/typed_data_patch.dart" -+ patches: "../../../third_party/dart/sdk/lib/_internal/vm/lib/typed_data_patch.dart" - - ui: - uri: "../../lib/ui/ui.dart" -diff --git a/shell/platform/fuchsia/dart_runner/kernel/libraries.json b/shell/platform/fuchsia/dart_runner/kernel/libraries.json -index 0abe212e6..24c664852 100644 ---- a/shell/platform/fuchsia/dart_runner/kernel/libraries.json -+++ b/shell/platform/fuchsia/dart_runner/kernel/libraries.json -@@ -1,43 +1,43 @@ - { - "comment:0": "NOTE: THIS FILE IS GENERATED. DO NOT EDIT.", -- "comment:1": "Instead modify 'shell/platform/fuchsia/dart_runner/kernel/libraries.yaml' and follow the instructions therein.", -+ "comment:1": "Instead modify 'flutter/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml' and follow the instructions therein.", - "dart_runner": { - "libraries": { - "_builtin": { -- "uri": "../../../../../../third_party/dart/runtime/bin/builtin.dart" -+ "uri": "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/builtin.dart" - }, - "core": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/core_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/array.dart", -- "../../../../../../third_party/dart/runtime/lib/array_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/bigint_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/bool_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/date_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/double.dart", -- "../../../../../../third_party/dart/runtime/lib/double_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/errors_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/expando_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/function.dart", -- "../../../../../../third_party/dart/runtime/lib/function_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/growable_array.dart", -- "../../../../../../third_party/dart/runtime/lib/identical_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/immutable_map.dart", -- "../../../../../../third_party/dart/runtime/lib/integers.dart", -- "../../../../../../third_party/dart/runtime/lib/integers_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/invocation_mirror_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/lib_prefix.dart", -- "../../../../../../third_party/dart/runtime/lib/map_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/null_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/object_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/regexp_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/stacktrace.dart", -- "../../../../../../third_party/dart/runtime/lib/stopwatch_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/string_buffer_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/string_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/type_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/uri_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/weak_property.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/core_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/array.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/array_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/bigint_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/bool_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/date_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/double.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/double_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/errors_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/expando_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/function.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/function_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/growable_array.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/identical_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/immutable_map.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/integers.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/integers_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/invocation_mirror_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/lib_prefix.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/map_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/null_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/object_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/regexp_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/stacktrace.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/stopwatch_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/string_buffer_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/string_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/type_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/uri_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/weak_property.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/core/core.dart" - }, -@@ -46,30 +46,30 @@ - }, - "async": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/async_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/deferred_load_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/schedule_microtask_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/timer_patch.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/async_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/deferred_load_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/schedule_microtask_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/async/async.dart" - }, - "collection": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/collection_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/compact_hash.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/collection_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/compact_hash.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/collection/collection.dart" - }, - "ffi": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/ffi_patch.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_type_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/ffi/ffi.dart" - }, - "typed_data": { -- "patches": "../../../../../../third_party/dart/runtime/lib/typed_data_patch.dart", -+ "patches": "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/typed_data_patch.dart", - "uri": "../../../../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" - }, - "nativewrappers": { -@@ -77,24 +77,24 @@ - }, - "mirrors": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/mirrors_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/mirrors_impl.dart", -- "../../../../../../third_party/dart/runtime/lib/mirror_reference.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_impl.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirror_reference.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - }, - "developer": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/developer.dart", -- "../../../../../../third_party/dart/runtime/lib/profiler.dart", -- "../../../../../../third_party/dart/runtime/lib/timeline.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/developer.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/profiler.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timeline.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/developer/developer.dart" - }, - "isolate": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/isolate_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/timer_impl.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/isolate_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_impl.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/isolate/isolate.dart" - }, -@@ -103,48 +103,48 @@ - }, - "wasm": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/wasm_patch.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/wasm_patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/wasm/wasm.dart" - }, - "io": { - "patches": [ -- "../../../../../../third_party/dart/runtime/bin/common_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/directory_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/eventhandler_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/file_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/file_system_entity_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/filter_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/io_service_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/namespace_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/platform_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/process_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/socket_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/stdio_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/secure_socket_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/sync_socket_patch.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/common_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/directory_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/eventhandler_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/file_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/file_system_entity_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/filter_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/io_service_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/namespace_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/platform_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/process_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/socket_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/stdio_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/secure_socket_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/sync_socket_patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/io/io.dart" - }, - "_internal": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/internal_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/class_id_fasta.dart", -- "../../../../../../third_party/dart/runtime/lib/print_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/symbol_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/internal_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/class_id_fasta.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/print_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/symbol_patch.dart", - "../../../../../../third_party/dart/sdk/lib/internal/patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/internal/internal.dart" - }, - "convert": { -- "patches": "../../../../../../third_party/dart/runtime/lib/convert_patch.dart", -+ "patches": "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/convert_patch.dart", - "uri": "../../../../../../third_party/dart/sdk/lib/convert/convert.dart" - }, - "profiler": { - "uri": "../../../../../../third_party/dart/sdk/lib/profiler/profiler.dart" - }, - "math": { -- "patches": "../../../../../../third_party/dart/runtime/lib/math_patch.dart", -+ "patches": "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/math_patch.dart", - "uri": "../../../../../../third_party/dart/sdk/lib/math/math.dart" - }, - "_http": { -diff --git a/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml b/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml -index cab901e60..5e1f638cd 100644 ---- a/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml -+++ b/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml -@@ -14,87 +14,87 @@ - dart_runner: - libraries: - _builtin: -- uri: "../../../../../../third_party/dart/runtime/bin/builtin.dart" -+ uri: "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/builtin.dart" - - _internal: - uri: "../../../../../../third_party/dart/sdk/lib/internal/internal.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/internal_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/class_id_fasta.dart" -- - "../../../../../../third_party/dart/runtime/lib/print_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/symbol_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/internal_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/class_id_fasta.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/print_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/symbol_patch.dart" - - "../../../../../../third_party/dart/sdk/lib/internal/patch.dart" - - async: - uri: "../../../../../../third_party/dart/sdk/lib/async/async.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/async_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/deferred_load_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/schedule_microtask_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/timer_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/async_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/deferred_load_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/schedule_microtask_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_patch.dart" - - collection: - uri: "../../../../../../third_party/dart/sdk/lib/collection/collection.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/collection_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/compact_hash.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/collection_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/compact_hash.dart" - - convert: - uri: "../../../../../../third_party/dart/sdk/lib/convert/convert.dart" -- patches: "../../../../../../third_party/dart/runtime/lib/convert_patch.dart" -+ patches: "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/convert_patch.dart" - - core: - uri: "../../../../../../third_party/dart/sdk/lib/core/core.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/core_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/array.dart" -- - "../../../../../../third_party/dart/runtime/lib/array_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/bigint_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/bool_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/date_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/double.dart" -- - "../../../../../../third_party/dart/runtime/lib/double_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/errors_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/expando_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/function.dart" -- - "../../../../../../third_party/dart/runtime/lib/function_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/growable_array.dart" -- - "../../../../../../third_party/dart/runtime/lib/identical_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/immutable_map.dart" -- - "../../../../../../third_party/dart/runtime/lib/integers.dart" -- - "../../../../../../third_party/dart/runtime/lib/integers_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/invocation_mirror_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/lib_prefix.dart" -- - "../../../../../../third_party/dart/runtime/lib/map_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/null_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/object_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/regexp_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/stacktrace.dart" -- - "../../../../../../third_party/dart/runtime/lib/stopwatch_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/string_buffer_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/string_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/type_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/uri_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/weak_property.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/core_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/array.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/array_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/bigint_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/bool_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/date_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/double.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/double_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/errors_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/expando_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/function.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/function_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/growable_array.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/identical_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/immutable_map.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/integers.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/integers_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/invocation_mirror_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/lib_prefix.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/map_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/null_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/object_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/regexp_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/stacktrace.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/stopwatch_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/string_buffer_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/string_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/type_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/uri_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/weak_property.dart" - - developer: - uri: "../../../../../../third_party/dart/sdk/lib/developer/developer.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/developer.dart" -- - "../../../../../../third_party/dart/runtime/lib/profiler.dart" -- - "../../../../../../third_party/dart/runtime/lib/timeline.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/developer.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/profiler.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timeline.dart" - - ffi: - uri: "../../../../../../third_party/dart/sdk/lib/ffi/ffi.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/ffi_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_type_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_patch.dart" - - wasm: - uri: "../../../../../../third_party/dart/sdk/lib/wasm/wasm.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/wasm_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/wasm_patch.dart" - - _http: - uri: "../../../../../../third_party/dart/sdk/lib/_http/http.dart" -@@ -102,37 +102,37 @@ dart_runner: - io: - uri: "../../../../../../third_party/dart/sdk/lib/io/io.dart" - patches: -- - "../../../../../../third_party/dart/runtime/bin/common_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/directory_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/eventhandler_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/file_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/file_system_entity_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/filter_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/io_service_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/namespace_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/platform_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/process_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/socket_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/stdio_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/secure_socket_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/sync_socket_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/common_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/directory_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/eventhandler_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/file_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/file_system_entity_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/filter_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/io_service_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/namespace_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/platform_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/process_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/socket_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/stdio_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/secure_socket_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/sync_socket_patch.dart" - - isolate: - uri: "../../../../../../third_party/dart/sdk/lib/isolate/isolate.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/isolate_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/timer_impl.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/isolate_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_impl.dart" - - math: - uri: "../../../../../../third_party/dart/sdk/lib/math/math.dart" -- patches: "../../../../../../third_party/dart/runtime/lib/math_patch.dart" -+ patches: "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/math_patch.dart" - - mirrors: - uri: "../../../../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/mirrors_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/mirrors_impl.dart" -- - "../../../../../../third_party/dart/runtime/lib/mirror_reference.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_impl.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirror_reference.dart" - - nativewrappers: - uri: "../../../../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart" -@@ -142,7 +142,7 @@ dart_runner: - - typed_data: - uri: "../../../../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" -- patches: "../../../../../../third_party/dart/runtime/lib/typed_data_patch.dart" -+ patches: "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/typed_data_patch.dart" - - fuchsia.builtin: - uri: "../../../../../../flutter/shell/platform/fuchsia/dart_runner/embedder/builtin.dart" -diff --git a/shell/platform/fuchsia/flutter/kernel/libraries.json b/shell/platform/fuchsia/flutter/kernel/libraries.json -index 5a4602d8c..a8436200f 100644 ---- a/shell/platform/fuchsia/flutter/kernel/libraries.json -+++ b/shell/platform/fuchsia/flutter/kernel/libraries.json -@@ -1,43 +1,43 @@ - { - "comment:0": "NOTE: THIS FILE IS GENERATED. DO NOT EDIT.", -- "comment:1": "Instead modify 'shell/platform/fuchsia/flutter/kernel/libraries.yaml' and follow the instructions therein.", -+ "comment:1": "Instead modify 'flutter/shell/platform/fuchsia/flutter/kernel/libraries.yaml' and follow the instructions therein.", - "flutter_runner": { - "libraries": { - "_builtin": { -- "uri": "../../../../../../third_party/dart/runtime/bin/builtin.dart" -+ "uri": "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/builtin.dart" - }, - "core": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/core_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/array.dart", -- "../../../../../../third_party/dart/runtime/lib/array_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/bigint_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/bool_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/date_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/double.dart", -- "../../../../../../third_party/dart/runtime/lib/double_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/errors_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/expando_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/function.dart", -- "../../../../../../third_party/dart/runtime/lib/function_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/growable_array.dart", -- "../../../../../../third_party/dart/runtime/lib/identical_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/immutable_map.dart", -- "../../../../../../third_party/dart/runtime/lib/integers.dart", -- "../../../../../../third_party/dart/runtime/lib/integers_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/invocation_mirror_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/lib_prefix.dart", -- "../../../../../../third_party/dart/runtime/lib/map_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/null_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/object_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/regexp_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/stacktrace.dart", -- "../../../../../../third_party/dart/runtime/lib/stopwatch_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/string_buffer_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/string_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/type_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/uri_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/weak_property.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/core_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/array.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/array_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/bigint_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/bool_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/date_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/double.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/double_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/errors_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/expando_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/function.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/function_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/growable_array.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/identical_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/immutable_map.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/integers.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/integers_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/invocation_mirror_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/lib_prefix.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/map_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/null_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/object_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/regexp_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/stacktrace.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/stopwatch_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/string_buffer_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/string_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/type_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/uri_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/weak_property.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/core/core.dart" - }, -@@ -46,30 +46,30 @@ - }, - "async": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/async_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/deferred_load_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/schedule_microtask_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/timer_patch.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/async_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/deferred_load_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/schedule_microtask_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/async/async.dart" - }, - "collection": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/collection_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/compact_hash.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/collection_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/compact_hash.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/collection/collection.dart" - }, - "ffi": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/ffi_patch.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_type_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/ffi/ffi.dart" - }, - "typed_data": { -- "patches": "../../../../../../third_party/dart/runtime/lib/typed_data_patch.dart", -+ "patches": "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/typed_data_patch.dart", - "uri": "../../../../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" - }, - "nativewrappers": { -@@ -77,24 +77,24 @@ - }, - "mirrors": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/mirrors_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/mirrors_impl.dart", -- "../../../../../../third_party/dart/runtime/lib/mirror_reference.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_impl.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirror_reference.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - }, - "developer": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/developer.dart", -- "../../../../../../third_party/dart/runtime/lib/profiler.dart", -- "../../../../../../third_party/dart/runtime/lib/timeline.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/developer.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/profiler.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timeline.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/developer/developer.dart" - }, - "isolate": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/isolate_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/timer_impl.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/isolate_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_impl.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/isolate/isolate.dart" - }, -@@ -103,48 +103,48 @@ - }, - "wasm": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/wasm_patch.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/wasm_patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/wasm/wasm.dart" - }, - "io": { - "patches": [ -- "../../../../../../third_party/dart/runtime/bin/common_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/directory_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/eventhandler_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/file_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/file_system_entity_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/filter_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/io_service_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/namespace_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/platform_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/process_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/socket_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/stdio_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/secure_socket_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/sync_socket_patch.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/common_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/directory_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/eventhandler_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/file_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/file_system_entity_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/filter_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/io_service_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/namespace_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/platform_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/process_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/socket_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/stdio_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/secure_socket_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/sync_socket_patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/io/io.dart" - }, - "_internal": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/internal_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/class_id_fasta.dart", -- "../../../../../../third_party/dart/runtime/lib/print_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/symbol_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/internal_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/class_id_fasta.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/print_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/symbol_patch.dart", - "../../../../../../third_party/dart/sdk/lib/internal/patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/internal/internal.dart" - }, - "convert": { -- "patches": "../../../../../../third_party/dart/runtime/lib/convert_patch.dart", -+ "patches": "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/convert_patch.dart", - "uri": "../../../../../../third_party/dart/sdk/lib/convert/convert.dart" - }, - "profiler": { - "uri": "../../../../../../third_party/dart/sdk/lib/profiler/profiler.dart" - }, - "math": { -- "patches": "../../../../../../third_party/dart/runtime/lib/math_patch.dart", -+ "patches": "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/math_patch.dart", - "uri": "../../../../../../third_party/dart/sdk/lib/math/math.dart" - }, - "_http": { -@@ -160,7 +160,7 @@ - "uri": "../../../../../../flutter/lib/ui/ui.dart" - }, - "vmservice_io": { -- "uri": "../../../../../../third_party/dart/runtime/bin/vmservice/vmservice_io.dart" -+ "uri": "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/vmservice/vmservice_io.dart" - } - } - } -diff --git a/shell/platform/fuchsia/flutter/kernel/libraries.yaml b/shell/platform/fuchsia/flutter/kernel/libraries.yaml -index f8385ca29..05b7f4f9f 100644 ---- a/shell/platform/fuchsia/flutter/kernel/libraries.yaml -+++ b/shell/platform/fuchsia/flutter/kernel/libraries.yaml -@@ -14,87 +14,87 @@ - flutter_runner: - libraries: - _builtin: -- uri: "../../../../../../third_party/dart/runtime/bin/builtin.dart" -+ uri: "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/builtin.dart" - - _internal: - uri: "../../../../../../third_party/dart/sdk/lib/internal/internal.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/internal_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/class_id_fasta.dart" -- - "../../../../../../third_party/dart/runtime/lib/print_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/symbol_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/internal_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/class_id_fasta.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/print_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/symbol_patch.dart" - - "../../../../../../third_party/dart/sdk/lib/internal/patch.dart" - - async: - uri: "../../../../../../third_party/dart/sdk/lib/async/async.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/async_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/deferred_load_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/schedule_microtask_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/timer_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/async_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/deferred_load_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/schedule_microtask_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_patch.dart" - - collection: - uri: "../../../../../../third_party/dart/sdk/lib/collection/collection.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/collection_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/compact_hash.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/collection_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/compact_hash.dart" - - convert: - uri: "../../../../../../third_party/dart/sdk/lib/convert/convert.dart" -- patches: "../../../../../../third_party/dart/runtime/lib/convert_patch.dart" -+ patches: "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/convert_patch.dart" - - core: - uri: "../../../../../../third_party/dart/sdk/lib/core/core.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/core_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/array.dart" -- - "../../../../../../third_party/dart/runtime/lib/array_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/bigint_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/bool_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/date_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/double.dart" -- - "../../../../../../third_party/dart/runtime/lib/double_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/errors_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/expando_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/function.dart" -- - "../../../../../../third_party/dart/runtime/lib/function_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/growable_array.dart" -- - "../../../../../../third_party/dart/runtime/lib/identical_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/immutable_map.dart" -- - "../../../../../../third_party/dart/runtime/lib/integers.dart" -- - "../../../../../../third_party/dart/runtime/lib/integers_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/invocation_mirror_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/lib_prefix.dart" -- - "../../../../../../third_party/dart/runtime/lib/map_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/null_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/object_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/regexp_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/stacktrace.dart" -- - "../../../../../../third_party/dart/runtime/lib/stopwatch_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/string_buffer_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/string_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/type_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/uri_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/weak_property.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/core_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/array.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/array_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/bigint_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/bool_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/date_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/double.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/double_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/errors_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/expando_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/function.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/function_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/growable_array.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/identical_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/immutable_map.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/integers.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/integers_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/invocation_mirror_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/lib_prefix.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/map_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/null_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/object_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/regexp_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/stacktrace.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/stopwatch_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/string_buffer_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/string_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/type_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/uri_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/weak_property.dart" - - developer: - uri: "../../../../../../third_party/dart/sdk/lib/developer/developer.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/developer.dart" -- - "../../../../../../third_party/dart/runtime/lib/profiler.dart" -- - "../../../../../../third_party/dart/runtime/lib/timeline.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/developer.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/profiler.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timeline.dart" - - ffi: - uri: "../../../../../../third_party/dart/sdk/lib/ffi/ffi.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/ffi_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_type_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_patch.dart" - - wasm: - uri: "../../../../../../third_party/dart/sdk/lib/wasm/wasm.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/wasm_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/wasm_patch.dart" - - _http: - uri: "../../../../../../third_party/dart/sdk/lib/_http/http.dart" -@@ -102,37 +102,37 @@ flutter_runner: - io: - uri: "../../../../../../third_party/dart/sdk/lib/io/io.dart" - patches: -- - "../../../../../../third_party/dart/runtime/bin/common_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/directory_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/eventhandler_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/file_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/file_system_entity_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/filter_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/io_service_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/namespace_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/platform_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/process_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/socket_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/stdio_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/secure_socket_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/sync_socket_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/common_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/directory_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/eventhandler_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/file_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/file_system_entity_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/filter_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/io_service_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/namespace_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/platform_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/process_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/socket_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/stdio_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/secure_socket_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/sync_socket_patch.dart" - - isolate: - uri: "../../../../../../third_party/dart/sdk/lib/isolate/isolate.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/isolate_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/timer_impl.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/isolate_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_impl.dart" - - math: - uri: "../../../../../../third_party/dart/sdk/lib/math/math.dart" -- patches: "../../../../../../third_party/dart/runtime/lib/math_patch.dart" -+ patches: "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/math_patch.dart" - - mirrors: - uri: "../../../../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/mirrors_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/mirrors_impl.dart" -- - "../../../../../../third_party/dart/runtime/lib/mirror_reference.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_impl.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirror_reference.dart" - - nativewrappers: - uri: "../../../../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart" -@@ -142,7 +142,7 @@ flutter_runner: - - typed_data: - uri: "../../../../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" -- patches: "../../../../../../third_party/dart/runtime/lib/typed_data_patch.dart" -+ patches: "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/typed_data_patch.dart" - - fuchsia.builtin: - uri: "../../../../../../flutter/shell/platform/fuchsia/dart_runner/embedder/builtin.dart" -@@ -160,4 +160,4 @@ flutter_runner: - uri: "../../../../../../third_party/dart/sdk/lib/vmservice/vmservice.dart" - - vmservice_io: -- uri: "../../../../../../third_party/dart/runtime/bin/vmservice/vmservice_io.dart" -+ uri: "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/vmservice/vmservice_io.dart" diff --git a/tools/patches/flutter-engine/e7e45599cb1a74ff88d7d00a33f25029e42df757.patch b/tools/patches/flutter-engine/e7e45599cb1a74ff88d7d00a33f25029e42df757.patch new file mode 100644 index 00000000000..2ae1b315a93 --- /dev/null +++ b/tools/patches/flutter-engine/e7e45599cb1a74ff88d7d00a33f25029e42df757.patch @@ -0,0 +1,32 @@ +diff --git a/third_party/tonic/dart_persistent_value.cc b/third_party/tonic/dart_persistent_value.cc +index 9ed6f70f3532..3bc46505d31f 100644 +--- a/third_party/tonic/dart_persistent_value.cc ++++ b/third_party/tonic/dart_persistent_value.cc +@@ -43,8 +43,12 @@ void DartPersistentValue::Clear() { + return; + } + +- DartIsolateScope scope(dart_state->isolate()); +- Dart_DeletePersistentHandle(value_); ++ if (Dart_CurrentIsolateGroup()) { ++ Dart_DeletePersistentHandle(value_); ++ } else { ++ DartIsolateScope scope(dart_state->isolate()); ++ Dart_DeletePersistentHandle(value_); ++ } + dart_state_.reset(); + value_ = nullptr; + } +diff --git a/third_party/tonic/dart_wrappable.cc b/third_party/tonic/dart_wrappable.cc +index 42c8fff2805b..89064ac8eef7 100644 +--- a/third_party/tonic/dart_wrappable.cc ++++ b/third_party/tonic/dart_wrappable.cc +@@ -37,7 +37,7 @@ void DartWrappable::ClearDartWrapper() { + TONIC_CHECK(!LogIfError(Dart_SetNativeInstanceField(wrapper, kPeerIndex, 0))); + TONIC_CHECK( + !LogIfError(Dart_SetNativeInstanceField(wrapper, kWrapperInfoIndex, 0))); +- Dart_DeleteWeakPersistentHandle(Dart_CurrentIsolate(), dart_wrapper_); ++ Dart_DeleteWeakPersistentHandle(dart_wrapper_); + dart_wrapper_ = nullptr; + this->ReleaseDartWrappableReference(); + } diff --git a/tools/patches/flutter-engine/ea969c358e24f71b865d5f720c0c1c8456a53bad.patch b/tools/patches/flutter-engine/ea969c358e24f71b865d5f720c0c1c8456a53bad.patch deleted file mode 100644 index 6151279fb43..00000000000 --- a/tools/patches/flutter-engine/ea969c358e24f71b865d5f720c0c1c8456a53bad.patch +++ /dev/null @@ -1,1305 +0,0 @@ -diff --git a/lib/snapshot/libraries.json b/lib/snapshot/libraries.json -index b6ffcef58..c4783158b 100644 ---- a/lib/snapshot/libraries.json -+++ b/lib/snapshot/libraries.json -@@ -4,69 +4,69 @@ - "flutter": { - "libraries": { - "_builtin": { -- "uri": "../../../third_party/dart/runtime/bin/builtin.dart" -+ "uri": "../../../third_party/dart/sdk/lib/_internal/vm/bin/builtin.dart" - }, - "core": { - "patches": [ -- "../../../third_party/dart/runtime/lib/core_patch.dart", -- "../../../third_party/dart/runtime/lib/array.dart", -- "../../../third_party/dart/runtime/lib/array_patch.dart", -- "../../../third_party/dart/runtime/lib/bigint_patch.dart", -- "../../../third_party/dart/runtime/lib/bool_patch.dart", -- "../../../third_party/dart/runtime/lib/date_patch.dart", -- "../../../third_party/dart/runtime/lib/double.dart", -- "../../../third_party/dart/runtime/lib/double_patch.dart", -- "../../../third_party/dart/runtime/lib/errors_patch.dart", -- "../../../third_party/dart/runtime/lib/expando_patch.dart", -- "../../../third_party/dart/runtime/lib/function.dart", -- "../../../third_party/dart/runtime/lib/function_patch.dart", -- "../../../third_party/dart/runtime/lib/growable_array.dart", -- "../../../third_party/dart/runtime/lib/identical_patch.dart", -- "../../../third_party/dart/runtime/lib/immutable_map.dart", -- "../../../third_party/dart/runtime/lib/integers.dart", -- "../../../third_party/dart/runtime/lib/integers_patch.dart", -- "../../../third_party/dart/runtime/lib/invocation_mirror_patch.dart", -- "../../../third_party/dart/runtime/lib/lib_prefix.dart", -- "../../../third_party/dart/runtime/lib/map_patch.dart", -- "../../../third_party/dart/runtime/lib/null_patch.dart", -- "../../../third_party/dart/runtime/lib/object_patch.dart", -- "../../../third_party/dart/runtime/lib/regexp_patch.dart", -- "../../../third_party/dart/runtime/lib/stacktrace.dart", -- "../../../third_party/dart/runtime/lib/stopwatch_patch.dart", -- "../../../third_party/dart/runtime/lib/string_buffer_patch.dart", -- "../../../third_party/dart/runtime/lib/string_patch.dart", -- "../../../third_party/dart/runtime/lib/type_patch.dart", -- "../../../third_party/dart/runtime/lib/uri_patch.dart", -- "../../../third_party/dart/runtime/lib/weak_property.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/core_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/array.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/array_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/bigint_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/bool_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/date_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/double.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/double_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/errors_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/expando_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/function.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/function_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/growable_array.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/identical_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/immutable_map.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/integers.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/integers_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/invocation_mirror_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/lib_prefix.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/map_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/null_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/object_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/regexp_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/stacktrace.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/stopwatch_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/string_buffer_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/string_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/type_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/uri_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/weak_property.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/core/core.dart" - }, - "async": { - "patches": [ -- "../../../third_party/dart/runtime/lib/async_patch.dart", -- "../../../third_party/dart/runtime/lib/deferred_load_patch.dart", -- "../../../third_party/dart/runtime/lib/schedule_microtask_patch.dart", -- "../../../third_party/dart/runtime/lib/timer_patch.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/async_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/deferred_load_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/schedule_microtask_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_patch.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/async/async.dart" - }, - "collection": { - "patches": [ -- "../../../third_party/dart/runtime/lib/collection_patch.dart", -- "../../../third_party/dart/runtime/lib/compact_hash.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/collection_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/compact_hash.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/collection/collection.dart" - }, - "ffi": { - "patches": [ -- "../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart", -- "../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart", -- "../../../third_party/dart/runtime/lib/ffi_patch.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_type_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_patch.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/ffi/ffi.dart" - }, - "typed_data": { -- "patches": "../../../third_party/dart/runtime/lib/typed_data_patch.dart", -+ "patches": "../../../third_party/dart/sdk/lib/_internal/vm/lib/typed_data_patch.dart", - "uri": "../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" - }, - "nativewrappers": { -@@ -74,24 +74,24 @@ - }, - "mirrors": { - "patches": [ -- "../../../third_party/dart/runtime/lib/mirrors_patch.dart", -- "../../../third_party/dart/runtime/lib/mirrors_impl.dart", -- "../../../third_party/dart/runtime/lib/mirror_reference.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_impl.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/mirror_reference.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - }, - "developer": { - "patches": [ -- "../../../third_party/dart/runtime/lib/developer.dart", -- "../../../third_party/dart/runtime/lib/profiler.dart", -- "../../../third_party/dart/runtime/lib/timeline.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/developer.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/profiler.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/timeline.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/developer/developer.dart" - }, - "isolate": { - "patches": [ -- "../../../third_party/dart/runtime/lib/isolate_patch.dart", -- "../../../third_party/dart/runtime/lib/timer_impl.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/isolate_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_impl.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/isolate/isolate.dart" - }, -@@ -100,48 +100,48 @@ - }, - "wasm": { - "patches": [ -- "../../../third_party/dart/runtime/lib/wasm_patch.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/wasm_patch.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/wasm/wasm.dart" - }, - "io": { - "patches": [ -- "../../../third_party/dart/runtime/bin/common_patch.dart", -- "../../../third_party/dart/runtime/bin/directory_patch.dart", -- "../../../third_party/dart/runtime/bin/eventhandler_patch.dart", -- "../../../third_party/dart/runtime/bin/file_patch.dart", -- "../../../third_party/dart/runtime/bin/file_system_entity_patch.dart", -- "../../../third_party/dart/runtime/bin/filter_patch.dart", -- "../../../third_party/dart/runtime/bin/io_service_patch.dart", -- "../../../third_party/dart/runtime/bin/namespace_patch.dart", -- "../../../third_party/dart/runtime/bin/platform_patch.dart", -- "../../../third_party/dart/runtime/bin/process_patch.dart", -- "../../../third_party/dart/runtime/bin/socket_patch.dart", -- "../../../third_party/dart/runtime/bin/stdio_patch.dart", -- "../../../third_party/dart/runtime/bin/secure_socket_patch.dart", -- "../../../third_party/dart/runtime/bin/sync_socket_patch.dart" -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/common_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/directory_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/eventhandler_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/file_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/file_system_entity_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/filter_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/io_service_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/namespace_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/platform_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/process_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/socket_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/stdio_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/secure_socket_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/bin/sync_socket_patch.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/io/io.dart" - }, - "_internal": { - "patches": [ -- "../../../third_party/dart/runtime/lib/internal_patch.dart", -- "../../../third_party/dart/runtime/lib/class_id_fasta.dart", -- "../../../third_party/dart/runtime/lib/print_patch.dart", -- "../../../third_party/dart/runtime/lib/symbol_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/internal_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/class_id_fasta.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/print_patch.dart", -+ "../../../third_party/dart/sdk/lib/_internal/vm/lib/symbol_patch.dart", - "../../../third_party/dart/sdk/lib/internal/patch.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/internal/internal.dart" - }, - "convert": { -- "patches": "../../../third_party/dart/runtime/lib/convert_patch.dart", -+ "patches": "../../../third_party/dart/sdk/lib/_internal/vm/lib/convert_patch.dart", - "uri": "../../../third_party/dart/sdk/lib/convert/convert.dart" - }, - "profiler": { - "uri": "../../../third_party/dart/sdk/lib/profiler/profiler.dart" - }, - "math": { -- "patches": "../../../third_party/dart/runtime/lib/math_patch.dart", -+ "patches": "../../../third_party/dart/sdk/lib/_internal/vm/lib/math_patch.dart", - "uri": "../../../third_party/dart/sdk/lib/math/math.dart" - }, - "_http": { -diff --git a/lib/snapshot/libraries.yaml b/lib/snapshot/libraries.yaml -index 392e0500b..7269819f7 100644 ---- a/lib/snapshot/libraries.yaml -+++ b/lib/snapshot/libraries.yaml -@@ -14,87 +14,87 @@ - flutter: - libraries: - _builtin: -- uri: "../../../third_party/dart/runtime/bin/builtin.dart" -+ uri: "../../../third_party/dart/sdk/lib/_internal/vm/bin/builtin.dart" - - _internal: - uri: "../../../third_party/dart/sdk/lib/internal/internal.dart" - patches: -- - "../../../third_party/dart/runtime/lib/internal_patch.dart" -- - "../../../third_party/dart/runtime/lib/class_id_fasta.dart" -- - "../../../third_party/dart/runtime/lib/print_patch.dart" -- - "../../../third_party/dart/runtime/lib/symbol_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/internal_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/class_id_fasta.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/print_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/symbol_patch.dart" - - "../../../third_party/dart/sdk/lib/internal/patch.dart" - - async: - uri: "../../../third_party/dart/sdk/lib/async/async.dart" - patches: -- - "../../../third_party/dart/runtime/lib/async_patch.dart" -- - "../../../third_party/dart/runtime/lib/deferred_load_patch.dart" -- - "../../../third_party/dart/runtime/lib/schedule_microtask_patch.dart" -- - "../../../third_party/dart/runtime/lib/timer_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/async_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/deferred_load_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/schedule_microtask_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_patch.dart" - - collection: - uri: "../../../third_party/dart/sdk/lib/collection/collection.dart" - patches: -- - "../../../third_party/dart/runtime/lib/collection_patch.dart" -- - "../../../third_party/dart/runtime/lib/compact_hash.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/collection_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/compact_hash.dart" - - convert: - uri: "../../../third_party/dart/sdk/lib/convert/convert.dart" -- patches: "../../../third_party/dart/runtime/lib/convert_patch.dart" -+ patches: "../../../third_party/dart/sdk/lib/_internal/vm/lib/convert_patch.dart" - - core: - uri: "../../../third_party/dart/sdk/lib/core/core.dart" - patches: -- - "../../../third_party/dart/runtime/lib/core_patch.dart" -- - "../../../third_party/dart/runtime/lib/array.dart" -- - "../../../third_party/dart/runtime/lib/array_patch.dart" -- - "../../../third_party/dart/runtime/lib/bigint_patch.dart" -- - "../../../third_party/dart/runtime/lib/bool_patch.dart" -- - "../../../third_party/dart/runtime/lib/date_patch.dart" -- - "../../../third_party/dart/runtime/lib/double.dart" -- - "../../../third_party/dart/runtime/lib/double_patch.dart" -- - "../../../third_party/dart/runtime/lib/errors_patch.dart" -- - "../../../third_party/dart/runtime/lib/expando_patch.dart" -- - "../../../third_party/dart/runtime/lib/function.dart" -- - "../../../third_party/dart/runtime/lib/function_patch.dart" -- - "../../../third_party/dart/runtime/lib/growable_array.dart" -- - "../../../third_party/dart/runtime/lib/identical_patch.dart" -- - "../../../third_party/dart/runtime/lib/immutable_map.dart" -- - "../../../third_party/dart/runtime/lib/integers.dart" -- - "../../../third_party/dart/runtime/lib/integers_patch.dart" -- - "../../../third_party/dart/runtime/lib/invocation_mirror_patch.dart" -- - "../../../third_party/dart/runtime/lib/lib_prefix.dart" -- - "../../../third_party/dart/runtime/lib/map_patch.dart" -- - "../../../third_party/dart/runtime/lib/null_patch.dart" -- - "../../../third_party/dart/runtime/lib/object_patch.dart" -- - "../../../third_party/dart/runtime/lib/regexp_patch.dart" -- - "../../../third_party/dart/runtime/lib/stacktrace.dart" -- - "../../../third_party/dart/runtime/lib/stopwatch_patch.dart" -- - "../../../third_party/dart/runtime/lib/string_buffer_patch.dart" -- - "../../../third_party/dart/runtime/lib/string_patch.dart" -- - "../../../third_party/dart/runtime/lib/type_patch.dart" -- - "../../../third_party/dart/runtime/lib/uri_patch.dart" -- - "../../../third_party/dart/runtime/lib/weak_property.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/core_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/array.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/array_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/bigint_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/bool_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/date_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/double.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/double_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/errors_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/expando_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/function.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/function_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/growable_array.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/identical_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/immutable_map.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/integers.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/integers_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/invocation_mirror_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/lib_prefix.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/map_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/null_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/object_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/regexp_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/stacktrace.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/stopwatch_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/string_buffer_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/string_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/type_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/uri_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/weak_property.dart" - - developer: - uri: "../../../third_party/dart/sdk/lib/developer/developer.dart" - patches: -- - "../../../third_party/dart/runtime/lib/developer.dart" -- - "../../../third_party/dart/runtime/lib/profiler.dart" -- - "../../../third_party/dart/runtime/lib/timeline.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/developer.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/profiler.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/timeline.dart" - - ffi: - uri: "../../../third_party/dart/sdk/lib/ffi/ffi.dart" - patches: -- - "../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart" -- - "../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart" -- - "../../../third_party/dart/runtime/lib/ffi_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_type_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_patch.dart" - - wasm: - uri: "../../../third_party/dart/sdk/lib/wasm/wasm.dart" - patches: -- - "../../../third_party/dart/runtime/lib/wasm_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/wasm_patch.dart" - - _http: - uri: "../../../third_party/dart/sdk/lib/_http/http.dart" -@@ -102,37 +102,37 @@ flutter: - io: - uri: "../../../third_party/dart/sdk/lib/io/io.dart" - patches: -- - "../../../third_party/dart/runtime/bin/common_patch.dart" -- - "../../../third_party/dart/runtime/bin/directory_patch.dart" -- - "../../../third_party/dart/runtime/bin/eventhandler_patch.dart" -- - "../../../third_party/dart/runtime/bin/file_patch.dart" -- - "../../../third_party/dart/runtime/bin/file_system_entity_patch.dart" -- - "../../../third_party/dart/runtime/bin/filter_patch.dart" -- - "../../../third_party/dart/runtime/bin/io_service_patch.dart" -- - "../../../third_party/dart/runtime/bin/namespace_patch.dart" -- - "../../../third_party/dart/runtime/bin/platform_patch.dart" -- - "../../../third_party/dart/runtime/bin/process_patch.dart" -- - "../../../third_party/dart/runtime/bin/socket_patch.dart" -- - "../../../third_party/dart/runtime/bin/stdio_patch.dart" -- - "../../../third_party/dart/runtime/bin/secure_socket_patch.dart" -- - "../../../third_party/dart/runtime/bin/sync_socket_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/common_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/directory_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/eventhandler_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/file_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/file_system_entity_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/filter_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/io_service_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/namespace_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/platform_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/process_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/socket_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/stdio_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/secure_socket_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/bin/sync_socket_patch.dart" - - isolate: - uri: "../../../third_party/dart/sdk/lib/isolate/isolate.dart" - patches: -- - "../../../third_party/dart/runtime/lib/isolate_patch.dart" -- - "../../../third_party/dart/runtime/lib/timer_impl.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/isolate_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_impl.dart" - - math: - uri: "../../../third_party/dart/sdk/lib/math/math.dart" -- patches: "../../../third_party/dart/runtime/lib/math_patch.dart" -+ patches: "../../../third_party/dart/sdk/lib/_internal/vm/lib/math_patch.dart" - - mirrors: - uri: "../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - patches: -- - "../../../third_party/dart/runtime/lib/mirrors_patch.dart" -- - "../../../third_party/dart/runtime/lib/mirrors_impl.dart" -- - "../../../third_party/dart/runtime/lib/mirror_reference.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_patch.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_impl.dart" -+ - "../../../third_party/dart/sdk/lib/_internal/vm/lib/mirror_reference.dart" - - nativewrappers: - uri: "../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart" -@@ -142,7 +142,7 @@ flutter: - - typed_data: - uri: "../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" -- patches: "../../../third_party/dart/runtime/lib/typed_data_patch.dart" -+ patches: "../../../third_party/dart/sdk/lib/_internal/vm/lib/typed_data_patch.dart" - - ui: - uri: "../../lib/ui/ui.dart" -diff --git a/shell/platform/fuchsia/dart_runner/kernel/libraries.json b/shell/platform/fuchsia/dart_runner/kernel/libraries.json -index 0abe212e6..24c664852 100644 ---- a/shell/platform/fuchsia/dart_runner/kernel/libraries.json -+++ b/shell/platform/fuchsia/dart_runner/kernel/libraries.json -@@ -1,43 +1,43 @@ - { - "comment:0": "NOTE: THIS FILE IS GENERATED. DO NOT EDIT.", -- "comment:1": "Instead modify 'shell/platform/fuchsia/dart_runner/kernel/libraries.yaml' and follow the instructions therein.", -+ "comment:1": "Instead modify 'flutter/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml' and follow the instructions therein.", - "dart_runner": { - "libraries": { - "_builtin": { -- "uri": "../../../../../../third_party/dart/runtime/bin/builtin.dart" -+ "uri": "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/builtin.dart" - }, - "core": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/core_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/array.dart", -- "../../../../../../third_party/dart/runtime/lib/array_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/bigint_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/bool_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/date_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/double.dart", -- "../../../../../../third_party/dart/runtime/lib/double_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/errors_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/expando_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/function.dart", -- "../../../../../../third_party/dart/runtime/lib/function_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/growable_array.dart", -- "../../../../../../third_party/dart/runtime/lib/identical_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/immutable_map.dart", -- "../../../../../../third_party/dart/runtime/lib/integers.dart", -- "../../../../../../third_party/dart/runtime/lib/integers_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/invocation_mirror_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/lib_prefix.dart", -- "../../../../../../third_party/dart/runtime/lib/map_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/null_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/object_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/regexp_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/stacktrace.dart", -- "../../../../../../third_party/dart/runtime/lib/stopwatch_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/string_buffer_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/string_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/type_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/uri_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/weak_property.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/core_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/array.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/array_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/bigint_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/bool_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/date_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/double.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/double_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/errors_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/expando_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/function.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/function_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/growable_array.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/identical_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/immutable_map.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/integers.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/integers_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/invocation_mirror_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/lib_prefix.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/map_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/null_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/object_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/regexp_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/stacktrace.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/stopwatch_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/string_buffer_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/string_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/type_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/uri_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/weak_property.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/core/core.dart" - }, -@@ -46,30 +46,30 @@ - }, - "async": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/async_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/deferred_load_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/schedule_microtask_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/timer_patch.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/async_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/deferred_load_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/schedule_microtask_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/async/async.dart" - }, - "collection": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/collection_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/compact_hash.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/collection_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/compact_hash.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/collection/collection.dart" - }, - "ffi": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/ffi_patch.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_type_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/ffi/ffi.dart" - }, - "typed_data": { -- "patches": "../../../../../../third_party/dart/runtime/lib/typed_data_patch.dart", -+ "patches": "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/typed_data_patch.dart", - "uri": "../../../../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" - }, - "nativewrappers": { -@@ -77,24 +77,24 @@ - }, - "mirrors": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/mirrors_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/mirrors_impl.dart", -- "../../../../../../third_party/dart/runtime/lib/mirror_reference.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_impl.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirror_reference.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - }, - "developer": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/developer.dart", -- "../../../../../../third_party/dart/runtime/lib/profiler.dart", -- "../../../../../../third_party/dart/runtime/lib/timeline.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/developer.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/profiler.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timeline.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/developer/developer.dart" - }, - "isolate": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/isolate_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/timer_impl.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/isolate_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_impl.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/isolate/isolate.dart" - }, -@@ -103,48 +103,48 @@ - }, - "wasm": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/wasm_patch.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/wasm_patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/wasm/wasm.dart" - }, - "io": { - "patches": [ -- "../../../../../../third_party/dart/runtime/bin/common_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/directory_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/eventhandler_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/file_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/file_system_entity_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/filter_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/io_service_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/namespace_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/platform_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/process_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/socket_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/stdio_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/secure_socket_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/sync_socket_patch.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/common_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/directory_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/eventhandler_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/file_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/file_system_entity_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/filter_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/io_service_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/namespace_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/platform_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/process_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/socket_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/stdio_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/secure_socket_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/sync_socket_patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/io/io.dart" - }, - "_internal": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/internal_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/class_id_fasta.dart", -- "../../../../../../third_party/dart/runtime/lib/print_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/symbol_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/internal_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/class_id_fasta.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/print_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/symbol_patch.dart", - "../../../../../../third_party/dart/sdk/lib/internal/patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/internal/internal.dart" - }, - "convert": { -- "patches": "../../../../../../third_party/dart/runtime/lib/convert_patch.dart", -+ "patches": "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/convert_patch.dart", - "uri": "../../../../../../third_party/dart/sdk/lib/convert/convert.dart" - }, - "profiler": { - "uri": "../../../../../../third_party/dart/sdk/lib/profiler/profiler.dart" - }, - "math": { -- "patches": "../../../../../../third_party/dart/runtime/lib/math_patch.dart", -+ "patches": "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/math_patch.dart", - "uri": "../../../../../../third_party/dart/sdk/lib/math/math.dart" - }, - "_http": { -diff --git a/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml b/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml -index cab901e60..5e1f638cd 100644 ---- a/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml -+++ b/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml -@@ -14,87 +14,87 @@ - dart_runner: - libraries: - _builtin: -- uri: "../../../../../../third_party/dart/runtime/bin/builtin.dart" -+ uri: "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/builtin.dart" - - _internal: - uri: "../../../../../../third_party/dart/sdk/lib/internal/internal.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/internal_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/class_id_fasta.dart" -- - "../../../../../../third_party/dart/runtime/lib/print_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/symbol_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/internal_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/class_id_fasta.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/print_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/symbol_patch.dart" - - "../../../../../../third_party/dart/sdk/lib/internal/patch.dart" - - async: - uri: "../../../../../../third_party/dart/sdk/lib/async/async.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/async_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/deferred_load_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/schedule_microtask_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/timer_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/async_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/deferred_load_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/schedule_microtask_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_patch.dart" - - collection: - uri: "../../../../../../third_party/dart/sdk/lib/collection/collection.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/collection_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/compact_hash.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/collection_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/compact_hash.dart" - - convert: - uri: "../../../../../../third_party/dart/sdk/lib/convert/convert.dart" -- patches: "../../../../../../third_party/dart/runtime/lib/convert_patch.dart" -+ patches: "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/convert_patch.dart" - - core: - uri: "../../../../../../third_party/dart/sdk/lib/core/core.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/core_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/array.dart" -- - "../../../../../../third_party/dart/runtime/lib/array_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/bigint_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/bool_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/date_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/double.dart" -- - "../../../../../../third_party/dart/runtime/lib/double_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/errors_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/expando_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/function.dart" -- - "../../../../../../third_party/dart/runtime/lib/function_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/growable_array.dart" -- - "../../../../../../third_party/dart/runtime/lib/identical_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/immutable_map.dart" -- - "../../../../../../third_party/dart/runtime/lib/integers.dart" -- - "../../../../../../third_party/dart/runtime/lib/integers_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/invocation_mirror_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/lib_prefix.dart" -- - "../../../../../../third_party/dart/runtime/lib/map_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/null_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/object_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/regexp_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/stacktrace.dart" -- - "../../../../../../third_party/dart/runtime/lib/stopwatch_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/string_buffer_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/string_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/type_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/uri_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/weak_property.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/core_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/array.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/array_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/bigint_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/bool_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/date_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/double.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/double_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/errors_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/expando_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/function.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/function_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/growable_array.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/identical_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/immutable_map.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/integers.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/integers_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/invocation_mirror_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/lib_prefix.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/map_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/null_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/object_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/regexp_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/stacktrace.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/stopwatch_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/string_buffer_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/string_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/type_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/uri_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/weak_property.dart" - - developer: - uri: "../../../../../../third_party/dart/sdk/lib/developer/developer.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/developer.dart" -- - "../../../../../../third_party/dart/runtime/lib/profiler.dart" -- - "../../../../../../third_party/dart/runtime/lib/timeline.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/developer.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/profiler.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timeline.dart" - - ffi: - uri: "../../../../../../third_party/dart/sdk/lib/ffi/ffi.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/ffi_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_type_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_patch.dart" - - wasm: - uri: "../../../../../../third_party/dart/sdk/lib/wasm/wasm.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/wasm_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/wasm_patch.dart" - - _http: - uri: "../../../../../../third_party/dart/sdk/lib/_http/http.dart" -@@ -102,37 +102,37 @@ dart_runner: - io: - uri: "../../../../../../third_party/dart/sdk/lib/io/io.dart" - patches: -- - "../../../../../../third_party/dart/runtime/bin/common_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/directory_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/eventhandler_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/file_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/file_system_entity_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/filter_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/io_service_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/namespace_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/platform_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/process_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/socket_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/stdio_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/secure_socket_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/sync_socket_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/common_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/directory_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/eventhandler_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/file_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/file_system_entity_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/filter_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/io_service_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/namespace_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/platform_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/process_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/socket_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/stdio_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/secure_socket_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/sync_socket_patch.dart" - - isolate: - uri: "../../../../../../third_party/dart/sdk/lib/isolate/isolate.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/isolate_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/timer_impl.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/isolate_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_impl.dart" - - math: - uri: "../../../../../../third_party/dart/sdk/lib/math/math.dart" -- patches: "../../../../../../third_party/dart/runtime/lib/math_patch.dart" -+ patches: "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/math_patch.dart" - - mirrors: - uri: "../../../../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/mirrors_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/mirrors_impl.dart" -- - "../../../../../../third_party/dart/runtime/lib/mirror_reference.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_impl.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirror_reference.dart" - - nativewrappers: - uri: "../../../../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart" -@@ -142,7 +142,7 @@ dart_runner: - - typed_data: - uri: "../../../../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" -- patches: "../../../../../../third_party/dart/runtime/lib/typed_data_patch.dart" -+ patches: "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/typed_data_patch.dart" - - fuchsia.builtin: - uri: "../../../../../../flutter/shell/platform/fuchsia/dart_runner/embedder/builtin.dart" -diff --git a/shell/platform/fuchsia/flutter/kernel/libraries.json b/shell/platform/fuchsia/flutter/kernel/libraries.json -index 5a4602d8c..a8436200f 100644 ---- a/shell/platform/fuchsia/flutter/kernel/libraries.json -+++ b/shell/platform/fuchsia/flutter/kernel/libraries.json -@@ -1,43 +1,43 @@ - { - "comment:0": "NOTE: THIS FILE IS GENERATED. DO NOT EDIT.", -- "comment:1": "Instead modify 'shell/platform/fuchsia/flutter/kernel/libraries.yaml' and follow the instructions therein.", -+ "comment:1": "Instead modify 'flutter/shell/platform/fuchsia/flutter/kernel/libraries.yaml' and follow the instructions therein.", - "flutter_runner": { - "libraries": { - "_builtin": { -- "uri": "../../../../../../third_party/dart/runtime/bin/builtin.dart" -+ "uri": "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/builtin.dart" - }, - "core": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/core_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/array.dart", -- "../../../../../../third_party/dart/runtime/lib/array_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/bigint_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/bool_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/date_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/double.dart", -- "../../../../../../third_party/dart/runtime/lib/double_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/errors_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/expando_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/function.dart", -- "../../../../../../third_party/dart/runtime/lib/function_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/growable_array.dart", -- "../../../../../../third_party/dart/runtime/lib/identical_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/immutable_map.dart", -- "../../../../../../third_party/dart/runtime/lib/integers.dart", -- "../../../../../../third_party/dart/runtime/lib/integers_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/invocation_mirror_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/lib_prefix.dart", -- "../../../../../../third_party/dart/runtime/lib/map_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/null_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/object_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/regexp_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/stacktrace.dart", -- "../../../../../../third_party/dart/runtime/lib/stopwatch_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/string_buffer_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/string_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/type_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/uri_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/weak_property.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/core_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/array.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/array_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/bigint_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/bool_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/date_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/double.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/double_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/errors_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/expando_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/function.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/function_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/growable_array.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/identical_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/immutable_map.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/integers.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/integers_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/invocation_mirror_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/lib_prefix.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/map_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/null_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/object_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/regexp_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/stacktrace.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/stopwatch_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/string_buffer_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/string_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/type_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/uri_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/weak_property.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/core/core.dart" - }, -@@ -46,30 +46,30 @@ - }, - "async": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/async_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/deferred_load_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/schedule_microtask_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/timer_patch.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/async_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/deferred_load_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/schedule_microtask_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/async/async.dart" - }, - "collection": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/collection_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/compact_hash.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/collection_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/compact_hash.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/collection/collection.dart" - }, - "ffi": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/ffi_patch.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_type_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/ffi/ffi.dart" - }, - "typed_data": { -- "patches": "../../../../../../third_party/dart/runtime/lib/typed_data_patch.dart", -+ "patches": "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/typed_data_patch.dart", - "uri": "../../../../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" - }, - "nativewrappers": { -@@ -77,24 +77,24 @@ - }, - "mirrors": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/mirrors_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/mirrors_impl.dart", -- "../../../../../../third_party/dart/runtime/lib/mirror_reference.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_impl.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirror_reference.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - }, - "developer": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/developer.dart", -- "../../../../../../third_party/dart/runtime/lib/profiler.dart", -- "../../../../../../third_party/dart/runtime/lib/timeline.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/developer.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/profiler.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timeline.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/developer/developer.dart" - }, - "isolate": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/isolate_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/timer_impl.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/isolate_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_impl.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/isolate/isolate.dart" - }, -@@ -103,48 +103,48 @@ - }, - "wasm": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/wasm_patch.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/wasm_patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/wasm/wasm.dart" - }, - "io": { - "patches": [ -- "../../../../../../third_party/dart/runtime/bin/common_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/directory_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/eventhandler_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/file_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/file_system_entity_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/filter_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/io_service_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/namespace_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/platform_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/process_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/socket_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/stdio_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/secure_socket_patch.dart", -- "../../../../../../third_party/dart/runtime/bin/sync_socket_patch.dart" -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/common_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/directory_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/eventhandler_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/file_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/file_system_entity_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/filter_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/io_service_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/namespace_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/platform_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/process_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/socket_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/stdio_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/secure_socket_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/sync_socket_patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/io/io.dart" - }, - "_internal": { - "patches": [ -- "../../../../../../third_party/dart/runtime/lib/internal_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/class_id_fasta.dart", -- "../../../../../../third_party/dart/runtime/lib/print_patch.dart", -- "../../../../../../third_party/dart/runtime/lib/symbol_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/internal_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/class_id_fasta.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/print_patch.dart", -+ "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/symbol_patch.dart", - "../../../../../../third_party/dart/sdk/lib/internal/patch.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/internal/internal.dart" - }, - "convert": { -- "patches": "../../../../../../third_party/dart/runtime/lib/convert_patch.dart", -+ "patches": "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/convert_patch.dart", - "uri": "../../../../../../third_party/dart/sdk/lib/convert/convert.dart" - }, - "profiler": { - "uri": "../../../../../../third_party/dart/sdk/lib/profiler/profiler.dart" - }, - "math": { -- "patches": "../../../../../../third_party/dart/runtime/lib/math_patch.dart", -+ "patches": "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/math_patch.dart", - "uri": "../../../../../../third_party/dart/sdk/lib/math/math.dart" - }, - "_http": { -@@ -160,7 +160,7 @@ - "uri": "../../../../../../flutter/lib/ui/ui.dart" - }, - "vmservice_io": { -- "uri": "../../../../../../third_party/dart/runtime/bin/vmservice/vmservice_io.dart" -+ "uri": "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/vmservice/vmservice_io.dart" - } - } - } -diff --git a/shell/platform/fuchsia/flutter/kernel/libraries.yaml b/shell/platform/fuchsia/flutter/kernel/libraries.yaml -index f8385ca29..05b7f4f9f 100644 ---- a/shell/platform/fuchsia/flutter/kernel/libraries.yaml -+++ b/shell/platform/fuchsia/flutter/kernel/libraries.yaml -@@ -14,87 +14,87 @@ - flutter_runner: - libraries: - _builtin: -- uri: "../../../../../../third_party/dart/runtime/bin/builtin.dart" -+ uri: "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/builtin.dart" - - _internal: - uri: "../../../../../../third_party/dart/sdk/lib/internal/internal.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/internal_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/class_id_fasta.dart" -- - "../../../../../../third_party/dart/runtime/lib/print_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/symbol_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/internal_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/class_id_fasta.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/print_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/symbol_patch.dart" - - "../../../../../../third_party/dart/sdk/lib/internal/patch.dart" - - async: - uri: "../../../../../../third_party/dart/sdk/lib/async/async.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/async_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/deferred_load_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/schedule_microtask_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/timer_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/async_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/deferred_load_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/schedule_microtask_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_patch.dart" - - collection: - uri: "../../../../../../third_party/dart/sdk/lib/collection/collection.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/collection_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/compact_hash.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/collection_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/compact_hash.dart" - - convert: - uri: "../../../../../../third_party/dart/sdk/lib/convert/convert.dart" -- patches: "../../../../../../third_party/dart/runtime/lib/convert_patch.dart" -+ patches: "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/convert_patch.dart" - - core: - uri: "../../../../../../third_party/dart/sdk/lib/core/core.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/core_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/array.dart" -- - "../../../../../../third_party/dart/runtime/lib/array_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/bigint_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/bool_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/date_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/double.dart" -- - "../../../../../../third_party/dart/runtime/lib/double_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/errors_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/expando_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/function.dart" -- - "../../../../../../third_party/dart/runtime/lib/function_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/growable_array.dart" -- - "../../../../../../third_party/dart/runtime/lib/identical_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/immutable_map.dart" -- - "../../../../../../third_party/dart/runtime/lib/integers.dart" -- - "../../../../../../third_party/dart/runtime/lib/integers_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/invocation_mirror_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/lib_prefix.dart" -- - "../../../../../../third_party/dart/runtime/lib/map_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/null_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/object_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/regexp_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/stacktrace.dart" -- - "../../../../../../third_party/dart/runtime/lib/stopwatch_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/string_buffer_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/string_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/type_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/uri_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/weak_property.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/core_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/array.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/array_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/bigint_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/bool_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/date_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/double.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/double_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/errors_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/expando_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/function.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/function_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/growable_array.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/identical_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/immutable_map.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/integers.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/integers_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/invocation_mirror_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/lib_prefix.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/map_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/null_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/object_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/regexp_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/stacktrace.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/stopwatch_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/string_buffer_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/string_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/type_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/uri_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/weak_property.dart" - - developer: - uri: "../../../../../../third_party/dart/sdk/lib/developer/developer.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/developer.dart" -- - "../../../../../../third_party/dart/runtime/lib/profiler.dart" -- - "../../../../../../third_party/dart/runtime/lib/timeline.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/developer.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/profiler.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timeline.dart" - - ffi: - uri: "../../../../../../third_party/dart/sdk/lib/ffi/ffi.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/ffi_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_type_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_patch.dart" - - wasm: - uri: "../../../../../../third_party/dart/sdk/lib/wasm/wasm.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/wasm_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/wasm_patch.dart" - - _http: - uri: "../../../../../../third_party/dart/sdk/lib/_http/http.dart" -@@ -102,37 +102,37 @@ flutter_runner: - io: - uri: "../../../../../../third_party/dart/sdk/lib/io/io.dart" - patches: -- - "../../../../../../third_party/dart/runtime/bin/common_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/directory_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/eventhandler_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/file_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/file_system_entity_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/filter_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/io_service_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/namespace_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/platform_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/process_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/socket_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/stdio_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/secure_socket_patch.dart" -- - "../../../../../../third_party/dart/runtime/bin/sync_socket_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/common_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/directory_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/eventhandler_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/file_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/file_system_entity_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/filter_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/io_service_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/namespace_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/platform_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/process_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/socket_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/stdio_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/secure_socket_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/sync_socket_patch.dart" - - isolate: - uri: "../../../../../../third_party/dart/sdk/lib/isolate/isolate.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/isolate_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/timer_impl.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/isolate_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_impl.dart" - - math: - uri: "../../../../../../third_party/dart/sdk/lib/math/math.dart" -- patches: "../../../../../../third_party/dart/runtime/lib/math_patch.dart" -+ patches: "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/math_patch.dart" - - mirrors: - uri: "../../../../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - patches: -- - "../../../../../../third_party/dart/runtime/lib/mirrors_patch.dart" -- - "../../../../../../third_party/dart/runtime/lib/mirrors_impl.dart" -- - "../../../../../../third_party/dart/runtime/lib/mirror_reference.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_patch.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_impl.dart" -+ - "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/mirror_reference.dart" - - nativewrappers: - uri: "../../../../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart" -@@ -142,7 +142,7 @@ flutter_runner: - - typed_data: - uri: "../../../../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" -- patches: "../../../../../../third_party/dart/runtime/lib/typed_data_patch.dart" -+ patches: "../../../../../../third_party/dart/sdk/lib/_internal/vm/lib/typed_data_patch.dart" - - fuchsia.builtin: - uri: "../../../../../../flutter/shell/platform/fuchsia/dart_runner/embedder/builtin.dart" -@@ -160,4 +160,4 @@ flutter_runner: - uri: "../../../../../../third_party/dart/sdk/lib/vmservice/vmservice.dart" - - vmservice_io: -- uri: "../../../../../../third_party/dart/runtime/bin/vmservice/vmservice_io.dart" -+ uri: "../../../../../../third_party/dart/sdk/lib/_internal/vm/bin/vmservice/vmservice_io.dart"