Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 2692e4e

Browse files
bderobdero
authored
Revert "Remove uses of --full-dart-sdk from the engine_v2 builders. (#39297)"
This reverts commit 5c83e6e.
1 parent 521b975 commit 2692e4e

File tree

7 files changed

+183
-40
lines changed

7 files changed

+183
-40
lines changed

‎ci/builders/linux_arm_host_engine.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"gn": [
6060
"--runtime-mode",
6161
"debug",
62+
"--full-dart-sdk",
6263
"--target-os=linux",
6364
"--linux-cpu=arm64",
6465
"--prebuilt-dart-sdk"

‎ci/builders/linux_host_engine.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
"out/host_debug/zip_archives/linux-x64/font-subset.zip",
7979
"out/host_debug/zip_archives/flutter_patched_sdk.zip",
8080
"out/host_debug/zip_archives/dart-sdk-linux-x64.zip",
81+
"out/host_debug/zip_archives/flutter-web-sdk-linux-x64.zip",
8182
"out/host_debug/zip_archives/linux-x64/linux-x64-flutter-gtk.zip"
8283
]
8384
}
@@ -92,6 +93,7 @@
9293
"gn": [
9394
"--runtime-mode",
9495
"debug",
96+
"--full-dart-sdk",
9597
"--prebuilt-dart-sdk",
9698
"--build-embedder-examples"
9799
],
@@ -103,6 +105,7 @@
103105
"flutter/build/archives:embedder",
104106
"flutter/build/archives:flutter_patched_sdk",
105107
"flutter/build/archives:dart_sdk_archive",
108+
"flutter/web_sdk",
106109
"flutter/tools/font-subset",
107110
"flutter/shell/platform/linux:flutter_gtk"
108111
]

‎ci/builders/mac_host_engine.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"include_paths": [
99
"out/host_debug/zip_archives/darwin-x64/artifacts.zip",
1010
"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip",
11-
"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip"
11+
"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip",
12+
"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip"
1213
],
1314
"name": "host_debug"
1415
}
@@ -25,6 +26,7 @@
2526
"--runtime-mode",
2627
"debug",
2728
"--no-lto",
29+
"--full-dart-sdk",
2830
"--prebuilt-dart-sdk",
2931
"--build-embedder-examples"
3032
],
@@ -35,6 +37,7 @@
3537
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
3638
"flutter/build/archives:artifacts",
3739
"flutter/build/archives:dart_sdk_archive",
40+
"flutter/web_sdk",
3841
"flutter/build/archives:archive_gen_snapshot",
3942
"flutter/build/archives:flutter_embedder_framework"
4043
]
@@ -159,6 +162,7 @@
159162
"--runtime-mode",
160163
"debug",
161164
"--no-lto",
165+
"--full-dart-sdk",
162166
"--prebuilt-dart-sdk"
163167
],
164168
"name": "mac_debug_arm64",

‎ci/builders/web_engine.json

Lines changed: 96 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,102 @@
11
{
2-
"generators": {
3-
"pub_dirs": [
4-
"flutter/lib/web_ui/",
5-
"flutter/web_sdk/web_engine_tester/"
6-
],
7-
"tasks": [
8-
{
9-
"name": "compile web_tests",
10-
"parameters": [
11-
"run",
12-
"compile_tests"
13-
],
14-
"scripts": [
15-
"out/host_debug_unopt/dart-sdk/bin/dart",
16-
"flutter/lib/web_ui/dev/felt.dart"
17-
]
2+
"builds": [
3+
{
4+
"archives": [],
5+
"drone_dimensions": [
6+
"device_type=none",
7+
"os=Windows-10"
8+
],
9+
"gn": [
10+
"--runtime-mode",
11+
"debug",
12+
"--unoptimized",
13+
"--full-dart-sdk",
14+
"--prebuilt-dart-sdk"
15+
],
16+
"name": "windows_host_debug",
17+
"ninja": {
18+
"config": "host_debug_unopt",
19+
"targets": []
1820
},
19-
{
20-
"name": "check licenses",
21-
"parameters": [
22-
"check-licenses"
21+
"platform": "Windows",
22+
"tests": []
23+
},
24+
{
25+
"archives": [],
26+
"drone_dimensions": [
27+
"device_type=none",
28+
"os=Linux"
29+
],
30+
"generators": {
31+
"pub_dirs": [
32+
"flutter/lib/web_ui/",
33+
"flutter/web_sdk/web_engine_tester/"
2334
],
24-
"scripts": [
25-
"out/host_debug_unopt/dart-sdk/bin/dart",
26-
"flutter/lib/web_ui/dev/felt.dart"
35+
"tasks": [
36+
{
37+
"name": "compile web_tests",
38+
"parameters": [
39+
"run",
40+
"compile_tests"
41+
],
42+
"scripts": [
43+
"out/host_debug_unopt/dart-sdk/bin/dart",
44+
"flutter/lib/web_ui/dev/felt.dart"
45+
]
46+
},
47+
{
48+
"name": "check licenses",
49+
"parameters": [
50+
"check-licenses"
51+
],
52+
"scripts": [
53+
"out/host_debug_unopt/dart-sdk/bin/dart",
54+
"flutter/lib/web_ui/dev/felt.dart"
55+
]
56+
},
57+
{
58+
"name": "web engine analysis",
59+
"parameters": [],
60+
"scripts": [
61+
"flutter/lib/web_ui/dev/web_engine_analysis.sh"
62+
]
63+
}
2764
]
2865
},
29-
{
30-
"name": "web engine analysis",
31-
"parameters": [
32-
"analyze"
33-
],
34-
"scripts": [
35-
"out/host_debug_unopt/dart-sdk/bin/dart",
36-
"flutter/lib/web_ui/dev/felt.dart"
37-
]
38-
}
39-
]
40-
}
66+
"gn": [
67+
"--runtime-mode",
68+
"debug",
69+
"--unoptimized",
70+
"--full-dart-sdk"
71+
],
72+
"name": "linux_host_debug_unopt",
73+
"ninja": {
74+
"config": "host_debug_unopt",
75+
"targets": []
76+
},
77+
"platform": "Linux",
78+
"tests": []
79+
},
80+
{
81+
"archives": [],
82+
"drone_dimensions": [
83+
"device_type=none",
84+
"os=Mac"
85+
],
86+
"gn": [
87+
"--runtime-mode",
88+
"debug",
89+
"--unoptimized",
90+
"--full-dart-sdk",
91+
"--prebuilt-dart-sdk"
92+
],
93+
"name": "mac_host_debug_unopt",
94+
"ninja": {
95+
"config": "host_debug_unopt",
96+
"targets": []
97+
},
98+
"platform": "Mac",
99+
"tests": []
100+
}
101+
]
41102
}

‎ci/builders/windows_arm_host_engine.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"out/host_debug_arm64/zip_archives/windows-arm64/font-subset.zip",
1212
"out/host_debug_arm64/zip_archives/dart-sdk-windows-arm64.zip",
1313
"out/host_debug_arm64/zip_archives/windows-arm64-debug/windows-arm64-flutter.zip",
14-
"out/host_debug_arm64/zip_archives/windows-arm64/flutter-cpp-client-wrapper.zip"
14+
"out/host_debug_arm64/zip_archives/windows-arm64/flutter-cpp-client-wrapper.zip",
15+
"out/host_debug_arm64/zip_archives/flutter-web-sdk-windows-arm64.zip"
1516
],
1617
"name": "host_debug_arm64"
1718
}
@@ -26,6 +27,7 @@
2627
"gn": [
2728
"--runtime-mode",
2829
"debug",
30+
"--full-dart-sdk",
2931
"--no-lto",
3032
"--windows-cpu",
3133
"arm64"
@@ -39,7 +41,8 @@
3941
"flutter/tools/font-subset",
4042
"flutter/build/archives:dart_sdk_archive",
4143
"flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
42-
"flutter/build/archives:windows_flutter"
44+
"flutter/build/archives:windows_flutter",
45+
"flutter/web_sdk"
4346
]
4447
},
4548
"tests": []

‎ci/builders/windows_host_engine.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"out/host_debug/zip_archives/windows-x64/font-subset.zip",
1212
"out/host_debug/zip_archives/dart-sdk-windows-x64.zip",
1313
"out/host_debug/zip_archives/windows-x64-debug/windows-x64-flutter.zip",
14-
"out/host_debug/zip_archives/windows-x64/flutter-cpp-client-wrapper.zip"
14+
"out/host_debug/zip_archives/windows-x64/flutter-cpp-client-wrapper.zip",
15+
"out/host_debug/zip_archives/flutter-web-sdk-windows-x64.zip"
1516
],
1617
"name": "host_debug"
1718
}
@@ -26,6 +27,7 @@
2627
"gn": [
2728
"--runtime-mode",
2829
"debug",
30+
"--full-dart-sdk",
2931
"--no-lto"
3032
],
3133
"name": "host_debug",
@@ -38,7 +40,8 @@
3840
"flutter/tools/font-subset",
3941
"flutter/build/archives:dart_sdk_archive",
4042
"flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
41-
"flutter/build/archives:windows_flutter"
43+
"flutter/build/archives:windows_flutter",
44+
"flutter/web_sdk"
4245
]
4346
},
4447
"tests": [

‎lib/web_ui/dev/felt_windows.bat

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
:: TODO(yjbanov): migrate LUCI to felt.bat and delete this file.
2+
:: felt_windows: a command-line utility for Windows for building and testing
3+
:: Flutter web engine.
4+
:: FELT stands for Flutter Engine Local Tester.
5+
6+
@ECHO OFF
7+
SETLOCAL
8+
9+
FOR /F "tokens=1-2 delims=:" %%a in ('where gclient') DO SET GCLIENT_PATH=%%b
10+
IF %GCLIENT_PATH%==[] (ECHO "ERROR: gclient is not in your PATH")
11+
12+
FOR /F "tokens=1-2 delims=:" %%a in ('where ninja') DO SET NINJA_PATH=%%b
13+
IF %NINJA_PATH%==[] (ECHO "ERROR: ninja is not in your PATH")
14+
15+
SET FELT_DIR=%~dp0
16+
17+
:: web_ui directory is the parent of felt directory.
18+
FOR %%a IN ("%FELT_DIR:~0,-1%") DO SET WEB_UI_DIR=%%~dpa
19+
20+
:: Flutter Directory is grandparent of web_ui directory.
21+
FOR %%a IN ("%WEB_UI_DIR:~0,-1%") DO SET orTempValue=%%~dpa
22+
FOR %%a IN ("%orTempValue:~0,-1%") DO SET FLUTTER_DIR=%%~dpa
23+
24+
:: Engine source directory is the parent of flutter directory.
25+
FOR %%a IN ("%FLUTTER_DIR:~0,-1%") DO SET ENGINE_SRC_DIR=%%~dpa
26+
27+
SET DEV_DIR="%WEB_UI_DIR%dev"
28+
SET OUT_DIR="%ENGINE_SRC_DIR%out"
29+
SET HOST_DEBUG_UNOPT_DIR="%ENGINE_SRC_DIR%out\host_debug_unopt"
30+
SET SCRIPT_PATH="%DEV_DIR%felt.dart"
31+
SET STAMP_PATH="%DART_TOOL_DIR%felt.snapshot.stamp"
32+
SET GN="%FLUTTER_DIR%tools\gn"
33+
SET DART_TOOL_DIR="%WEB_UI_DIR%.dart_tool"
34+
SET SNAPSHOT_PATH="%DART_TOOL_DIR%felt.snapshot"
35+
SET SDK_PREBUILTS_DIR=%FLUTTER_DIR%\prebuilts
36+
SET PREBUILT_TARGET=windows-x64
37+
IF NOT DEFINED DART_SDK_DIR (
38+
SET DART_SDK_DIR=%SDK_PREBUILTS_DIR%\%PREBUILT_TARGET%\dart-sdk
39+
)
40+
41+
:: Set revision from using git in Flutter directory.
42+
CD %FLUTTER_DIR%
43+
FOR /F "tokens=1 delims=:" %%a in ('git rev-parse HEAD') DO SET REVISION=%%a
44+
45+
SET orTempValue=1
46+
IF NOT EXIST %OUT_DIR% (SET orTempValue=0)
47+
IF NOT EXIST %HOST_DEBUG_UNOPT_DIR% (SET orTempValue=0)
48+
IF %orTempValue%==0 (
49+
ECHO "Compiling the Dart SDK."
50+
CALL gclient sync
51+
CALL python %GN% --unoptimized --full-dart-sdk
52+
CALL ninja -C %HOST_DEBUG_UNOPT_DIR%)
53+
54+
:: TODO(yjbanov): The batch script does not support snapshot option.
55+
:: Support snapshot option.
56+
CALL :installdeps
57+
IF "%1"=="test" (%DART_SDK_DIR%\bin\dart %DEV_DIR%\felt.dart %* --browser=chrome) ELSE ( %DART_SDK_DIR%\bin\dart %DEV_DIR%\felt.dart %* )
58+
59+
EXIT /B %ERRORLEVEL%
60+
61+
:installdeps
62+
ECHO "Running \`pub get\` in 'engine/src/flutter/web_sdk/web_engine_tester'"
63+
cd "%FLUTTER_DIR%web_sdk\web_engine_tester"
64+
CALL %DART_SDK_DIR%\bin\dart pub get
65+
ECHO "Running \`pub get\` in 'engine/src/flutter/lib/web_ui'"
66+
cd %WEB_UI_DIR%
67+
CALL %DART_SDK_DIR%\bin\dart pub get
68+
EXIT /B 0

0 commit comments

Comments
 (0)