Skip to content

Commit

Permalink
macos android ci: android platform option prep
Browse files Browse the repository at this point in the history
(emulator / -gpu swiftshader_indirect support)
  • Loading branch information
mribbons committed Apr 26, 2023
1 parent b04d88f commit 6206d9c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions test/scripts/bootstrap-android-emulator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,15 @@ fi

[[ -z "$EMULATOR_FLAGS" ]] && EMULATOR_FLAGS=()

EMULATOR_FLAGS+=("-gpu" "swiftshader_indirect")
# Android platform support prep, older versions don't support -gpu swiftshader_indirect
[[ -z "$ANDROID_PLATFORM" ]] && ANDROID_PLATFORM=33
(( ANDROID_PLATFORM > 31 )) && EMULATOR_FLAGS+=("-gpu" "swiftshader_indirect")
# fixes adb: failed to install cmd: Can't find service: package

echo "Starting Android emulator..."
if [[ -z "$CI" ]]; then
"$emulator" @SSCAVD \
"${EMULATOR_FLAGS[@]}" \
"-gpu swiftshader_indirect" \
-camera-back none \
-no-boot-anim \
-no-window \
Expand All @@ -128,7 +129,6 @@ if [[ -z "$CI" ]]; then
else
"$emulator" @SSCAVD \
"${EMULATOR_FLAGS[@]}" \
"-gpu swiftshader_indirect" \
-camera-back none \
-no-boot-anim \
-no-window \
Expand Down

0 comments on commit 6206d9c

Please sign in to comment.