Skip to content

Commit 7e8adde

Browse files
authored
Migrate to Flutter 2.5.1 (#188)
* Fix build for 2.5.1 * Fix runtime errors * Remove the format job
1 parent f72b26d commit 7e8adde

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

azure-pipelines.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,7 @@ pr:
88
- flutter-*-tizen
99

1010
jobs:
11-
- job: format
12-
pool:
13-
name: Default
14-
demands: Agent.os -equals Linux
15-
steps:
16-
- checkout: self
17-
path: src/flutter
18-
- bash: ci/format.sh
19-
displayName: Verify formatting
2011
- job: test
21-
dependsOn: format
2212
pool:
2313
name: Default
2414
demands: agent.os -equals Linux
@@ -85,6 +75,8 @@ jobs:
8575
gclient sync -f -D
8676
sed -i 's/"-Wno-non-c-typedef-for-linkage",//g' build/config/compiler/BUILD.gn
8777
sed -i 's/"-Wno-psabi",//g' build/config/compiler/BUILD.gn
78+
sed -i 's/"-Wno-unused-but-set-parameter",//g' build/config/compiler/BUILD.gn
79+
sed -i 's/"-Wno-unused-but-set-variable",//g' build/config/compiler/BUILD.gn
8880
displayName: Disable build flags
8981
workingDirectory: $(Pipeline.Workspace)/src
9082
failOnStderr: true

ci/docker/tizen/tools/build-engine.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ else
5959
# FIXME: Remove unsupported options of tizen toolchains from BUILD.gn.
6060
sed -i 's/"-Wno-non-c-typedef-for-linkage",//g' src/build/config/compiler/BUILD.gn
6161
sed -i 's/"-Wno-psabi",//g' src/build/config/compiler/BUILD.gn
62+
sed -i 's/"-Wno-unused-but-set-parameter",//g' build/config/compiler/BUILD.gn
63+
sed -i 's/"-Wno-unused-but-set-variable",//g' build/config/compiler/BUILD.gn
6264

6365
src/flutter/tools/gn \
6466
--target-os $BUILD_OS \

shell/platform/tizen/flutter_tizen_engine.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ void FlutterTizenEngine::SendPointerEvent(const FlutterPointerEvent& event) {
343343
void FlutterTizenEngine::SendWindowMetrics(int32_t width,
344344
int32_t height,
345345
double pixel_ratio) {
346-
FlutterWindowMetricsEvent event;
346+
FlutterWindowMetricsEvent event = {};
347347
event.struct_size = sizeof(FlutterWindowMetricsEvent);
348348
event.width = width;
349349
event.height = height;

shell/platform/tizen/touch_event_handler.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ void TouchEventHandler::SendFlutterPointerEvent(FlutterPointerPhase phase,
6767
event.scroll_delta_y = scroll_delta_y * 2;
6868
event.timestamp = timestamp * 1000;
6969
event.device = device_id;
70+
event.device_kind = kFlutterPointerDeviceKindTouch;
7071

7172
engine_->SendPointerEvent(event);
7273
}

0 commit comments

Comments
 (0)