Skip to content

Commit e69dc8e

Browse files
committed
[Tizen] Fix Flutter 3.10 build
1 parent 018c50f commit e69dc8e

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ jobs:
5555

5656
- name: Build
5757
run: |
58+
# Ignore unsupported linker option.
59+
sed -i "/-Wl,--undefined-version/d" src/build/config/compiler/BUILD.gn
60+
5861
src/flutter/tools/gn \
5962
--target-os linux \
6063
--linux-cpu ${{ matrix.arch }} \
@@ -96,7 +99,7 @@ jobs:
9699
if-no-files-found: error
97100

98101
windows-build:
99-
runs-on: windows-2019
102+
runs-on: windows-latest
100103

101104
strategy:
102105
matrix:
@@ -118,7 +121,7 @@ jobs:
118121
run: |
119122
Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" -Name "LongPathsEnabled" -Value 1 -Force
120123
echo "DEPOT_TOOLS_WIN_TOOLCHAIN=0" >> $Env:GITHUB_ENV
121-
echo "GYP_MSVS_OVERRIDE_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise" >> $Env:GITHUB_ENV
124+
echo "GYP_MSVS_OVERRIDE_PATH=C:\Program Files\Microsoft Visual Studio\2022\Enterprise" >> $Env:GITHUB_ENV
122125
echo "WINDOWSSDKDIR=C:\Program Files (x86)\Windows Kits\10" >> $Env:GITHUB_ENV
123126
124127
- name: Install depot_tools
@@ -129,6 +132,7 @@ jobs:
129132
130133
- name: Run gclient sync
131134
working-directory: C:\workspace\engine
135+
shell: powershell
132136
run: |
133137
gclient config --name=src\flutter --unmanaged https://github.com/flutter-tizen/engine
134138
gclient setdep --var=download_dart_sdk=False --deps-file=src/flutter/DEPS
@@ -152,7 +156,7 @@ jobs:
152156
if-no-files-found: error
153157

154158
macos-build:
155-
runs-on: macos-11
159+
runs-on: macos-latest
156160

157161
strategy:
158162
matrix:

common/config.gni

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,4 @@ if (flutter_prebuilt_dart_sdk) {
125125
# TODO: We can't build the engine artifacts for arm (32-bit) right now;
126126
# see https://github.com/flutter/flutter/issues/74322
127127
build_engine_artifacts =
128-
flutter_build_engine_artifacts &&
129-
(current_toolchain == host_toolchain ||
130-
(is_linux && !is_chromeos && current_cpu != "arm") || is_mac || is_win)
128+
flutter_build_engine_artifacts && current_toolchain == host_toolchain

display_list/testing/BUILD.gn

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ surface_provider_include_software = !is_android && !is_ios
2929
# But, since benchmarks do not run on Windows and rendertests only
3030
# runs on SW by default, this restriction currently only limits the
3131
# ability to manually cross-check OpenGL on Windows for rendertests
32-
surface_provider_include_gl = !is_fuchsia && !is_ios && !is_win && !is_mac
32+
surface_provider_include_gl =
33+
!is_fuchsia && !is_ios && !is_win && !is_mac && !is_linux
3334

3435
# TODO (https://github.com/flutter/flutter/issues/107357):
3536
# impeller_enable_vulkan currently requires skia to not use VMA, which in turn

impeller/geometry/half.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#ifdef FML_OS_WIN
1717
using InternalHalf = uint16_t;
1818
#else
19-
using InternalHalf = _Float16;
19+
using InternalHalf = uint16_t;
2020
#endif
2121

2222
namespace impeller {

shell/config.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ declare_args() {
1717
test_enable_metal = shell_enable_metal
1818

1919
# The Vulkan unittests are combined with the GL unittests.
20-
test_enable_vulkan = is_fuchsia || shell_enable_gl
20+
test_enable_vulkan = is_fuchsia
2121
test_enable_software = shell_enable_software
2222
}

0 commit comments

Comments
 (0)