Skip to content

Commit dff8bd9

Browse files
godofredocgodofredoc
authored
Update linux android debug engine configs. (flutter#34039)
1 parent 9c067e6 commit dff8bd9

File tree

1 file changed

+168
-43
lines changed

1 file changed

+168
-43
lines changed

‎ci/builders/linux_android_debug_engine.json

Lines changed: 168 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,178 @@
33
{
44
"archives": [
55
{
6-
"name": "linux_profile_arm64",
6+
"name": "android_jit_release_x86",
77
"type": "gcs",
8-
"base_path": "out/linux_profile_arm64/zip_archives/",
8+
"base_path": "out/android_jit_release_x86/zip_archives/",
99
"include_paths": [
10-
"out/linux_profile_arm64/zip_archives/linux-arm64-profile/linux-arm64-flutter-gtk.zip"
10+
"out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
11+
"out/android_jit_release_x86/zip_archives/flutter_download_io"
1112
]
1213
}
1314
],
1415
"drone_dimensions": [
1516
"device_type=none",
1617
"os=Linux"
1718
],
19+
"gn": [
20+
"--android",
21+
"--android-cpu=x86",
22+
"--runtime-mode=jit_release"
23+
],
24+
"name": "android_jit_release_x86",
25+
"ninja": {
26+
"config": "android_jit_release_x86",
27+
"targets": [
28+
"flutter",
29+
"flutter/shell/platform/android:embedding_jars",
30+
"flutter/shell/platform/android:abi_jars",
31+
"flutter/shell/platform/android:robolectric_tests"
32+
]
33+
},
34+
"tests": [
35+
{
36+
"language": "python",
37+
"name": "Host Tests for android_jit_release_x86",
38+
"parameters": [
39+
"--variant",
40+
"android_jit_release_x86",
41+
"--type",
42+
"java",
43+
"--engine-capture-core-dump",
44+
"--android-variant",
45+
"android_jit_release_x86"
46+
],
47+
"script": "flutter/testing/run_tests.py",
48+
"type": "local"
49+
}
50+
]
51+
},
52+
{
53+
"archives": [
54+
{
55+
"name": "android_debug_unopt",
56+
"type": "gcs",
57+
"base_path": "out/android_release/zip_archives/",
58+
"include_paths": []
59+
}
60+
],
61+
"drone_dimensions": [
62+
"device_type=none",
63+
"os=Linux"
64+
],
1865
"gclient_custom_vars": {
1966
"download_android_deps": false
2067
},
2168
"gn": [
22-
"--runtime-mode",
23-
"profile",
24-
"--no-lto",
25-
"--target-os=linux",
26-
"--linux-cpu=arm64",
27-
"--prebuilt-dart-sdk"
28-
],
29-
"name": "linux_profile_arm64",
69+
"--android",
70+
"--unoptimized",
71+
"--runtime-mode=debug",
72+
"--no-lto"
73+
],
74+
"name": "android_debug_unopt",
3075
"ninja": {
31-
"config": "linux_profile_arm64",
76+
"config": "android_debug_unopt",
77+
"targets": []
78+
},
79+
"tests": []
80+
},
81+
{
82+
"archives": [
83+
{
84+
"name": "android_debug",
85+
"type": "gcs",
86+
"base_path": "out/android_debug/zip_archives/",
87+
"include_paths": [
88+
"out/android_debug/zip_archives/android-arm/symbols.zip",
89+
"out/android_debug/zip_archives/flutter_download_io",
90+
"out/android_debug/zip_archives/android-arm/sky_engine.zip",
91+
"out/android_debug/zip_archives/android-javadoc.zip"
92+
]
93+
}
94+
],
95+
"drone_dimensions": [
96+
"device_type=none",
97+
"os=Linux"
98+
],
99+
"gn": [
100+
"--android",
101+
"--android-cpu=arm",
102+
"--no-lto"
103+
],
104+
"name": "android_debug",
105+
"ninja": {
106+
"config": "android_debug",
32107
"targets": [
33-
"flutter/shell/platform/linux:flutter_gtk"
108+
"flutter",
109+
"flutter/sky/dist:zip",
110+
"flutter/shell/platform/android:embedding_jars",
111+
"flutter/shell/platform/android:abi_jars",
112+
"flutter/shell/platform/android:robolectric_tests"
113+
]
114+
},
115+
"tests": [
116+
{
117+
"language": "python",
118+
"name": "Host Tests for android_debug",
119+
"parameters": [
120+
"--variant",
121+
"android_debug",
122+
"--type",
123+
"java",
124+
"--engine-capture-core-dump",
125+
"--android-variant",
126+
"android_debug"
127+
],
128+
"script": "flutter/testing/run_tests.py",
129+
"type": "local"
130+
}
131+
]
132+
},
133+
{
134+
"archives": [
135+
{
136+
"name": "android_debug_arm64",
137+
"type": "gcs",
138+
"base_path": "out/android_debug_arm64/zip_archives/",
139+
"include_paths": [
140+
"out/android_debug_arm64/zip_archives/android-arm64/artifacts.zip",
141+
"out/android_debug_arm64/zip_archives/android-arm64/symbols.zip",
142+
"out/android_debug_arm64/zip_archives/flutter_download_io"
143+
]
144+
}
145+
],
146+
"drone_dimensions": [
147+
"device_type=none",
148+
"os=Linux"
149+
],
150+
"gclient_custom_vars": {
151+
"download_android_deps": false
152+
},
153+
"gn": [
154+
"--android",
155+
"--android-cpu=arm64",
156+
"--no-lto"
157+
],
158+
"name": "android_debug_arm64",
159+
"ninja": {
160+
"config": "android_debug_arm64",
161+
"targets": [
162+
"flutter",
163+
"flutter/shell/platform/android:abi_jars"
34164
]
35165
},
36166
"tests": []
37167
},
38168
{
39169
"archives": [
40170
{
41-
"name": "linux_debug_arm64",
171+
"name": "android_debug_x86",
42172
"type": "gcs",
43-
"base_path": "out/linux_debug_arm64/zip_archives/",
173+
"base_path": "out/android_debug_x86/zip_archives/",
44174
"include_paths": [
45-
"out/linux_debug_arm64/zip_archives/linux-arm64/artifacts.zip",
46-
"out/linux_debug_arm64/zip_archives/linux-arm64/font-subset.zip",
47-
"out/linux_debug_arm64/zip_archives/linux-arm64-debug/linux-arm64-flutter-gtk.zip",
48-
"out/linux_debug_arm64/zip_archives/dart-sdk-linux-arm64.zip"
175+
"out/android_debug_x86/zip_archives/android-x86/artifacts.zip",
176+
"out/android_debug_x86/zip_archives/android-x86/symbols.zip",
177+
"out/android_debug_x86/zip_archives/flutter_download_io"
49178
]
50179
}
51180
],
@@ -57,33 +186,30 @@
57186
"download_android_deps": false
58187
},
59188
"gn": [
60-
"--runtime-mode",
61-
"debug",
62-
"--full-dart-sdk",
63-
"--target-os=linux",
64-
"--linux-cpu=arm64",
65-
"--prebuilt-dart-sdk"
66-
],
67-
"name": "linux_debug_arm64",
189+
"--android",
190+
"--android-cpu=x86",
191+
"--no-lto"
192+
],
193+
"name": "android_debug_x86",
68194
"ninja": {
69-
"config": "linux_debug_arm64",
195+
"config": "android_debug_x86",
70196
"targets": [
71-
"flutter/build/archives:artifacts",
72-
"flutter/build/archives:dart_sdk_archive",
73-
"flutter/tools/font-subset",
74-
"flutter/shell/platform/linux:flutter_gtk"
197+
"flutter",
198+
"flutter/shell/platform/android:abi_jars"
75199
]
76200
},
77201
"tests": []
78202
},
79203
{
80204
"archives": [
81205
{
82-
"name": "linux_release_arm64",
206+
"name": "android_debug_x64",
83207
"type": "gcs",
84-
"base_path": "out/linux_release_arm64/zip_archives/",
208+
"base_path": "out/android_debug_x64/zip_archives/",
85209
"include_paths": [
86-
"out/linux_release_arm64/zip_archives/linux-arm64-release/linux-arm64-flutter-gtk.zip"
210+
"out/android_debug_x64/zip_archives/android-x64/artifacts.zip",
211+
"out/android_debug_x64/zip_archives/android-x64/symbols.zip",
212+
"out/android_debug_x64/zip_archives/flutter_download_io"
87213
]
88214
}
89215
],
@@ -95,17 +221,16 @@
95221
"download_android_deps": false
96222
},
97223
"gn": [
98-
"--runtime-mode",
99-
"release",
100-
"--target-os=linux",
101-
"--linux-cpu=arm64",
102-
"--prebuilt-dart-sdk"
224+
"--android",
225+
"--android-cpu=x64",
226+
"--no-lto"
103227
],
104-
"name": "linux_release_arm64",
228+
"name": "android_debug_x64",
105229
"ninja": {
106-
"config": "linux_release_arm64",
230+
"config": "android_debug_x64",
107231
"targets": [
108-
"flutter/shell/platform/linux:flutter_gtk"
232+
"flutter",
233+
"flutter/shell/platform/android:abi_jars"
109234
]
110235
},
111236
"tests": []

0 commit comments

Comments
 (0)