Support mixing images in local-image-local-instance mode
Acloud supports mixing local cuttlefish images with the system image
given by --local-system-image. Mixing the images requires OTA tools and
misc info of cuttlefish build. Acloud gets them from either environment
variables or command line arguments. The developers can use this feature
to test locally built images and the artifacts downloaded from build
server.
Test: acloud-dev create --local-instance \
--local-image --local-system-image
Test: acloud-dev create --local-instance \
--local-image ~/aosp_cf_x86_phone-target_files \
--local-system-image ~/aosp_x86-img \
--local-tool ~/cvd-host_package \
--local-tool ~/otatools
Bug: 176270532
Change-Id: I516848ce847178041b976cc65dea4aa342202a11
diff --git a/create/create_args.py b/create/create_args.py
index 63eaeea..40cf44e 100644
--- a/create/create_args.py
+++ b/create/create_args.py
@@ -555,9 +555,8 @@
raise errors.CheckPathError(
"Specified path doesn't exist: %s" % args.local_instance_dir)
- # TODO(b/133211308): Support TYPE_CF.
if not (args.local_system_image is None or
- args.avd_type == constants.TYPE_GF):
+ args.avd_type in (constants.TYPE_CF, constants.TYPE_GF)):
raise errors.UnsupportedCreateArgs("%s instance does not support "
"--local-system-image" %
args.avd_type)