Skip to content

Commit bbce18f

Browse files
committed
ci: use atd image for windows android smoke
1 parent 496c7ea commit bbce18f

3 files changed

Lines changed: 22 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -375,9 +375,9 @@ jobs:
375375
$avdmanager = Join-Path $toolsBin "avdmanager.bat"
376376
$adb = Join-Path $sdk "platform-tools\adb.exe"
377377
$emulator = Join-Path $sdk "emulator\emulator.exe"
378-
$windowsApi = "30"
378+
$windowsApi = "35"
379379
$windowsPlatform = "platforms;android-$windowsApi"
380-
$windowsSystemImage = "system-images;android-$windowsApi;google_apis;x86_64"
380+
$windowsSystemImage = "system-images;android-$windowsApi;google_atd;x86_64"
381381
382382
$yesFile = Join-Path $env:RUNNER_TEMP "android-sdk-yes.txt"
383383
1..200 | ForEach-Object { "y" } | Set-Content -Path $yesFile -Encoding ascii
@@ -410,15 +410,22 @@ jobs:
410410
$stderr = Join-Path $env:RUNNER_TEMP "simdeck-android-emulator.err.log"
411411
$args = @(
412412
"-avd", "SimDeck_Pixel_CI",
413-
"-no-window",
413+
"-qt-hide-window",
414414
"-no-audio",
415415
"-no-boot-anim",
416-
"-no-snapshot",
416+
"-no-snapshot-load",
417+
"-no-snapshot-save",
418+
"-wipe-data",
417419
"-gpu", "swiftshader_indirect",
418420
"-grpc", "8554",
419421
"-port", "5554",
420422
"-no-metrics",
421-
"-skip-adb-auth"
423+
"-skip-adb-auth",
424+
"-camera-back", "none",
425+
"-camera-front", "none",
426+
"-cores", "2",
427+
"-memory", "2048",
428+
"-verbose"
422429
)
423430
if ($accelSupported) {
424431
$args += @("-accel", "on")

packages/server/src/android.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,16 +319,22 @@ impl AndroidBridge {
319319
return Ok(false);
320320
}
321321
let grpc_port = self.grpc_port_for_avd(&avd_name)?;
322+
let grpc_port = grpc_port.to_string();
323+
let window_mode = if cfg!(target_os = "windows") {
324+
"-qt-hide-window"
325+
} else {
326+
"-no-window"
327+
};
322328
Command::new(self.emulator_path())
323329
.args([
324330
"-avd",
325331
&avd_name,
326-
"-no-window",
332+
window_mode,
327333
"-no-audio",
328334
"-gpu",
329335
"swiftshader_indirect",
330336
"-grpc",
331-
&grpc_port.to_string(),
337+
&grpc_port,
332338
])
333339
.stdin(Stdio::null())
334340
.stdout(Stdio::null())

scripts/github-actions.test.mjs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ test("Windows Android CI boot path is bounded and diagnostic", () => {
8181
);
8282

8383
assert.match(windowsBootStep, /\$accelSupported = \$LASTEXITCODE -eq 0/);
84+
assert.match(windowsBootStep, /google_atd/);
85+
assert.match(windowsBootStep, /"-qt-hide-window"/);
8486
assert.match(windowsBootStep, /"-accel", "on"/);
8587
assert.match(windowsBootStep, /"-accel", "off"/);
8688
assert.match(windowsBootStep, /-RedirectStandardOutput \$stdout/);

0 commit comments

Comments
 (0)