drm_hwcomposer: CI: launch_cvd: run modem_simulator
The modem simulator is currently disabled because, in an earlier version of cuttlefish, it was preventing drmhwc from launching. However, the missing service causes a lot of noise in logcat as the ServiceManager continuously looks for the IRadioModem service. Since the cuttlefish modem simulator is now working with drmhwc on Android16, enable the modem simulator and reduce the logcat and Activity Manager noise. Also, while here, remove the executable bit from launch-cvd.sh since it is only sourced, not run directly. Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
This commit is contained in:
parent
5a1d68b1f8
commit
e43697d99c
1 changed files with 1 additions and 8 deletions
9
.ci/android/launch-cvd.sh
Executable file → Normal file
9
.ci/android/launch-cvd.sh
Executable file → Normal file
|
|
@ -70,7 +70,7 @@ HOME=/cuttlefish launch_cvd \
|
|||
-blank_data_image_mb 65536 \
|
||||
-enable_audio=false \
|
||||
-enable-sandbox=false \
|
||||
-enable_modem_simulator=false \
|
||||
-enable_modem_simulator=true \
|
||||
-vsock_guest_cid=$VSOCK_CID \
|
||||
-cpus="${FDO_CI_CONCURRENT:-4}" \
|
||||
-extra_bootconfig_args="androidboot.vendor.apex.com.android.hardware.graphics.composer=com.android.hardware.graphics.composer.drm_hwcomposer"
|
||||
|
|
@ -78,10 +78,6 @@ HOME=/cuttlefish launch_cvd \
|
|||
while [ "$(adb shell dumpsys -l | grep SurfaceFlinger)" = "" ] ; do sleep 1; done
|
||||
adb shell dumpsys SurfaceFlinger | grep GLES
|
||||
|
||||
# Wait for drmhwc to start up
|
||||
while [ "$(adb logcat -d | grep -i hwc | grep -i ActivityManager)" = "" ] ; do sleep 1; done
|
||||
adb logcat -d | grep -i hwc
|
||||
|
||||
adb logcat -d | grep -i vkms
|
||||
echo "Running ro.build.version.sdk: $(adb shell getprop ro.build.version.sdk)"
|
||||
echo "Running ro.build.version.release: $(adb shell getprop ro.build.version.release)"
|
||||
|
|
@ -151,9 +147,6 @@ adb install --force-non-staged /new_apex/com.android.hardware.graphics.composer.
|
|||
adb logcat -c
|
||||
adb reboot
|
||||
adb wait-for-device devices
|
||||
while [ "$(adb logcat -d | grep -i hwc | grep -i ActivityManager)" = "" ] ; do sleep 1; done
|
||||
adb logcat -d | grep -i hwc
|
||||
|
||||
fdo_log_section_end push_new_apex
|
||||
|
||||
# If this service is missing, cts-tradefed will fail device pretests
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue