Fix "--config" exception in launch_cvd command.
The "--config" is new arg in launch_cvd, it would cause exception in old
build. Add the arg into "--undefok" to fix it.
Bug: 182486116
Test: acloud-dev create --branch git_qt-gsi --build-target cf_x86_phone-userdebug
Change-Id: Ia596a27998131923dbd56ddb9c661214b3cb8e93
diff --git a/create/local_image_local_instance.py b/create/local_image_local_instance.py
index 124c431..2471a3a 100644
--- a/create/local_image_local_instance.py
+++ b/create/local_image_local_instance.py
@@ -75,11 +75,12 @@
_TARGET_FILES_IMAGES_DIR_NAME = "IMAGES"
_TARGET_FILES_META_DIR_NAME = "META"
_MIXED_SUPER_IMAGE_NAME = "mixed_super.img"
-_CMD_LAUNCH_CVD_ARGS = (" -daemon -config=%s -run_adb_connector=%s "
- "-system_image_dir %s -instance_dir %s "
- "-undefok=report_anonymous_usage_stats,enable_sandbox "
- "-report_anonymous_usage_stats=y "
- "-enable_sandbox=false")
+_CMD_LAUNCH_CVD_ARGS = (
+ " -daemon -config=%s -run_adb_connector=%s "
+ "-system_image_dir %s -instance_dir %s "
+ "-undefok=report_anonymous_usage_stats,enable_sandbox,config "
+ "-report_anonymous_usage_stats=y "
+ "-enable_sandbox=false")
_CMD_LAUNCH_CVD_HW_ARGS = " -cpus %s -x_res %s -y_res %s -dpi %s -memory_mb %s"
_CMD_LAUNCH_CVD_GPU_ARG = " -gpu_mode=auto"
_CMD_LAUNCH_CVD_DISK_ARGS = (" -blank_data_image_mb %s "
diff --git a/create/local_image_local_instance_test.py b/create/local_image_local_instance_test.py
index 98fee97..0b893f2 100644
--- a/create/local_image_local_instance_test.py
+++ b/create/local_image_local_instance_test.py
@@ -35,32 +35,32 @@
LAUNCH_CVD_CMD_WITH_DISK = """sg group1 <<EOF
sg group2
-launch_cvd -daemon -config=phone -run_adb_connector=true -system_image_dir fake_image_dir -instance_dir fake_cvd_dir -undefok=report_anonymous_usage_stats,enable_sandbox -report_anonymous_usage_stats=y -enable_sandbox=false -cpus fake -x_res fake -y_res fake -dpi fake -memory_mb fake -blank_data_image_mb fake -data_policy always_create -start_vnc_server=true
+launch_cvd -daemon -config=phone -run_adb_connector=true -system_image_dir fake_image_dir -instance_dir fake_cvd_dir -undefok=report_anonymous_usage_stats,enable_sandbox,config -report_anonymous_usage_stats=y -enable_sandbox=false -cpus fake -x_res fake -y_res fake -dpi fake -memory_mb fake -blank_data_image_mb fake -data_policy always_create -start_vnc_server=true
EOF"""
LAUNCH_CVD_CMD_NO_DISK = """sg group1 <<EOF
sg group2
-launch_cvd -daemon -config=phone -run_adb_connector=true -system_image_dir fake_image_dir -instance_dir fake_cvd_dir -undefok=report_anonymous_usage_stats,enable_sandbox -report_anonymous_usage_stats=y -enable_sandbox=false -cpus fake -x_res fake -y_res fake -dpi fake -memory_mb fake -start_vnc_server=true
+launch_cvd -daemon -config=phone -run_adb_connector=true -system_image_dir fake_image_dir -instance_dir fake_cvd_dir -undefok=report_anonymous_usage_stats,enable_sandbox,config -report_anonymous_usage_stats=y -enable_sandbox=false -cpus fake -x_res fake -y_res fake -dpi fake -memory_mb fake -start_vnc_server=true
EOF"""
LAUNCH_CVD_CMD_NO_DISK_WITH_GPU = """sg group1 <<EOF
sg group2
-launch_cvd -daemon -config=phone -run_adb_connector=true -system_image_dir fake_image_dir -instance_dir fake_cvd_dir -undefok=report_anonymous_usage_stats,enable_sandbox -report_anonymous_usage_stats=y -enable_sandbox=false -cpus fake -x_res fake -y_res fake -dpi fake -memory_mb fake -start_vnc_server=true -gpu_mode=auto
+launch_cvd -daemon -config=phone -run_adb_connector=true -system_image_dir fake_image_dir -instance_dir fake_cvd_dir -undefok=report_anonymous_usage_stats,enable_sandbox,config -report_anonymous_usage_stats=y -enable_sandbox=false -cpus fake -x_res fake -y_res fake -dpi fake -memory_mb fake -start_vnc_server=true -gpu_mode=auto
EOF"""
LAUNCH_CVD_CMD_WITH_WEBRTC = """sg group1 <<EOF
sg group2
-launch_cvd -daemon -config=auto -run_adb_connector=true -system_image_dir fake_image_dir -instance_dir fake_cvd_dir -undefok=report_anonymous_usage_stats,enable_sandbox -report_anonymous_usage_stats=y -enable_sandbox=false -guest_enforce_security=false -vm_manager=crosvm -start_webrtc=true -webrtc_public_ip=0.0.0.0
+launch_cvd -daemon -config=auto -run_adb_connector=true -system_image_dir fake_image_dir -instance_dir fake_cvd_dir -undefok=report_anonymous_usage_stats,enable_sandbox,config -report_anonymous_usage_stats=y -enable_sandbox=false -guest_enforce_security=false -vm_manager=crosvm -start_webrtc=true -webrtc_public_ip=0.0.0.0
EOF"""
LAUNCH_CVD_CMD_WITH_SUPER_IMAGE = """sg group1 <<EOF
sg group2
-launch_cvd -daemon -config=phone -run_adb_connector=true -system_image_dir fake_image_dir -instance_dir fake_cvd_dir -undefok=report_anonymous_usage_stats,enable_sandbox -report_anonymous_usage_stats=y -enable_sandbox=false -start_vnc_server=true -super_image=fake_super_image
+launch_cvd -daemon -config=phone -run_adb_connector=true -system_image_dir fake_image_dir -instance_dir fake_cvd_dir -undefok=report_anonymous_usage_stats,enable_sandbox,config -report_anonymous_usage_stats=y -enable_sandbox=false -start_vnc_server=true -super_image=fake_super_image
EOF"""
LAUNCH_CVD_CMD_WITH_ARGS = """sg group1 <<EOF
sg group2
-launch_cvd -daemon -config=phone -run_adb_connector=true -system_image_dir fake_image_dir -instance_dir fake_cvd_dir -undefok=report_anonymous_usage_stats,enable_sandbox -report_anonymous_usage_stats=y -enable_sandbox=false -start_vnc_server=true -setupwizard_mode=REQUIRED
+launch_cvd -daemon -config=phone -run_adb_connector=true -system_image_dir fake_image_dir -instance_dir fake_cvd_dir -undefok=report_anonymous_usage_stats,enable_sandbox,config -report_anonymous_usage_stats=y -enable_sandbox=false -start_vnc_server=true -setupwizard_mode=REQUIRED
EOF"""
_EXPECTED_DEVICES_IN_REPORT = [
diff --git a/internal/lib/cvd_compute_client_multi_stage.py b/internal/lib/cvd_compute_client_multi_stage.py
index 76dd644..fc729b7 100644
--- a/internal/lib/cvd_compute_client_multi_stage.py
+++ b/internal/lib/cvd_compute_client_multi_stage.py
@@ -55,8 +55,8 @@
_DECOMPRESS_KERNEL_ARG = "-decompress_kernel=true"
_GPU_ARG = "-gpu_mode=auto"
-_AGREEMENT_PROMPT_ARGS = ["-undefok=report_anonymous_usage_stats",
- "-report_anonymous_usage_stats=y"]
+_AGREEMENT_PROMPT_ARG = "-report_anonymous_usage_stats=y"
+_UNDEFOK_ARG = "-undefok=report_anonymous_usage_stats,config"
_NUM_AVDS_ARG = "-num_instances=%(num_AVD)s"
_DEFAULT_BRANCH = "aosp-master"
_FETCHER_BUILD_TARGET = "aosp_cf_x86_phone-userdebug"
@@ -343,7 +343,8 @@
if self._gpu:
launch_cvd_args.append(_GPU_ARG)
- launch_cvd_args.extend(_AGREEMENT_PROMPT_ARGS)
+ launch_cvd_args.append(_UNDEFOK_ARG)
+ launch_cvd_args.append(_AGREEMENT_PROMPT_ARG)
return launch_cvd_args
def StopCvd(self):
diff --git a/internal/lib/cvd_compute_client_multi_stage_test.py b/internal/lib/cvd_compute_client_multi_stage_test.py
index 0027ee3..1c1776b 100644
--- a/internal/lib/cvd_compute_client_multi_stage_test.py
+++ b/internal/lib/cvd_compute_client_multi_stage_test.py
@@ -115,7 +115,7 @@
"-data_policy=always_create", "-blank_data_image_mb=10240",
"-cpus=2", "-memory_mb=4096", "-num_instances=2",
"--setupwizard_mode=REQUIRED", "-gpu_mode=auto",
- "-undefok=report_anonymous_usage_stats",
+ "-undefok=report_anonymous_usage_stats,config",
"-report_anonymous_usage_stats=y"]
launch_cvd_args = self.cvd_compute_client_multi_stage._GetLaunchCvdArgs(fake_avd_spec)
self.assertEqual(launch_cvd_args, expeted_args)
@@ -123,7 +123,7 @@
# test GetLaunchCvdArgs without avd_spec
expeted_args = ["-x_res=720", "-y_res=1280", "-dpi=160",
"--setupwizard_mode=REQUIRED", "-gpu_mode=auto",
- "-undefok=report_anonymous_usage_stats",
+ "-undefok=report_anonymous_usage_stats,config",
"-report_anonymous_usage_stats=y"]
launch_cvd_args = self.cvd_compute_client_multi_stage._GetLaunchCvdArgs(
avd_spec=None)
