Migrate to Flutter 2.5.1 (#188)

* Fix build for 2.5.1 * Fix runtime errors * Remove the format job
flutter-tizen · Oct 1, 2021 · 7e8adde · 7e8adde
1 parent f72b26d
commit 7e8adde
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -8,17 +8,7 @@ pr:
 - flutter-*-tizen
 
 jobs:
-- job: format
-  pool:
-    name: Default
-    demands: Agent.os -equals Linux
-  steps:
-  - checkout: self
-    path: src/flutter
-  - bash: ci/format.sh
-    displayName: Verify formatting
 - job: test
-  dependsOn: format
   pool:
     name: Default
     demands: agent.os -equals Linux
@@ -85,6 +75,8 @@ jobs:
       gclient sync -f -D
       sed -i 's/"-Wno-non-c-typedef-for-linkage",//g' build/config/compiler/BUILD.gn
       sed -i 's/"-Wno-psabi",//g' build/config/compiler/BUILD.gn
+      sed -i 's/"-Wno-unused-but-set-parameter",//g' build/config/compiler/BUILD.gn
+      sed -i 's/"-Wno-unused-but-set-variable",//g' build/config/compiler/BUILD.gn
     displayName: Disable build flags
     workingDirectory: $(Pipeline.Workspace)/src
     failOnStderr: true

diff --git a/ci/docker/tizen/tools/build-engine.sh b/ci/docker/tizen/tools/build-engine.sh
@@ -59,6 +59,8 @@ else
     # FIXME: Remove unsupported options of tizen toolchains from BUILD.gn.
     sed -i 's/"-Wno-non-c-typedef-for-linkage",//g' src/build/config/compiler/BUILD.gn
     sed -i 's/"-Wno-psabi",//g' src/build/config/compiler/BUILD.gn
+    sed -i 's/"-Wno-unused-but-set-parameter",//g' build/config/compiler/BUILD.gn
+    sed -i 's/"-Wno-unused-but-set-variable",//g' build/config/compiler/BUILD.gn
 
     src/flutter/tools/gn \
         --target-os $BUILD_OS \

diff --git a/shell/platform/tizen/flutter_tizen_engine.cc b/shell/platform/tizen/flutter_tizen_engine.cc
@@ -343,7 +343,7 @@ void FlutterTizenEngine::SendPointerEvent(const FlutterPointerEvent& event) {
 void FlutterTizenEngine::SendWindowMetrics(int32_t width,
                                            int32_t height,
                                            double pixel_ratio) {
-  FlutterWindowMetricsEvent event;
+  FlutterWindowMetricsEvent event = {};
   event.struct_size = sizeof(FlutterWindowMetricsEvent);
   event.width = width;
   event.height = height;

diff --git a/shell/platform/tizen/touch_event_handler.cc b/shell/platform/tizen/touch_event_handler.cc
@@ -67,6 +67,7 @@ void TouchEventHandler::SendFlutterPointerEvent(FlutterPointerPhase phase,
   event.scroll_delta_y = scroll_delta_y * 2;
   event.timestamp = timestamp * 1000;
   event.device = device_id;
+  event.device_kind = kFlutterPointerDeviceKindTouch;
 
   engine_->SendPointerEvent(event);
 }