diff --git a/engine/src/flutter/sky/tools/roll/patches/mojo/mojo_common_build.patch b/engine/src/flutter/sky/tools/roll/patches/mojo/mojo_common_build.patch new file mode 100644 index 00000000000..baecc8d4674 --- /dev/null +++ b/engine/src/flutter/sky/tools/roll/patches/mojo/mojo_common_build.patch @@ -0,0 +1,14 @@ +diff --git a/mojo/common/BUILD.gn b/mojo/common/BUILD.gn +index adac158..25ef0ca 100644 +--- a/mojo/common/BUILD.gn ++++ b/mojo/common/BUILD.gn +@@ -43,9 +43,6 @@ source_set("tests") { + test("mojo_common_unittests") { + deps = [ + ":tests", +- "//mojo/converters/array_string:tests", +- "//mojo/converters/base:tests", +- "//mojo/converters/url:tests", + "//mojo/data_pipe_utils:tests", + "//mojo/edk/test:run_all_unittests", + "//mojo/environment:chromium", diff --git a/engine/src/flutter/sky/tools/roll/patches/mojo/mojo_converters_input_events.patch b/engine/src/flutter/sky/tools/roll/patches/mojo/mojo_converters_input_events.patch deleted file mode 100644 index 5d161b9ca9b..00000000000 --- a/engine/src/flutter/sky/tools/roll/patches/mojo/mojo_converters_input_events.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/mojo/converters/input_events/input_events_type_converters.cc b/mojo/converters/input_events/input_events_type_converters.cc -index 6f2495f..e7b0f15 100644 ---- a/mojo/converters/input_events/input_events_type_converters.cc -+++ b/mojo/converters/input_events/input_events_type_converters.cc -@@ -283,7 +283,6 @@ scoped_ptr TypeConverter, EventPtr>::Convert( - // TODO: last flags isn't right. Need to send changed_flags. - scoped_ptr event(new ui::MouseEvent( - MojoMouseEventTypeToUIEvent(input), location, screen_location, -- base::TimeDelta::FromMilliseconds(input->time_stamp), - ui::EventFlags(input->flags), ui::EventFlags(input->flags))); - if (event->IsMouseWheelEvent()) { - // This conversion assumes we're using the mojo meaning of these diff --git a/engine/src/flutter/sky/tools/roll/roll.py b/engine/src/flutter/sky/tools/roll/roll.py index 5726e45fa69..72dc253b58f 100755 --- a/engine/src/flutter/sky/tools/roll/roll.py +++ b/engine/src/flutter/sky/tools/roll/roll.py @@ -73,7 +73,7 @@ dirs_from_mojo = [ 'mojo/android', 'mojo/application', 'mojo/common', - 'mojo/converters', + 'mojo/converters/geometry', ('mojo/dart/embedder', ['embedder.gni']), 'mojo/data_pipe_utils', 'mojo/edk',