commit 41f5f9bd243e95cf3fc500b7a68fb1554d7b8d24
author Kevin Cheng <kevcheng@google.com> Fri Jan 11 02:44:59 2019 -0800
committer Kevin Cheng <kevcheng@google.com> Fri Jan 11 02:51:34 2019 -0800
tree b8e090768511c7f4510f3aaf1b202e844a54d835
parent 35a441739279c35e6a29fb7e0012ddc707256284

If user didn't specify a flavor, we would make the wrong build target, don't do that.

Bug: 117554732
Test: acloud create
Change-Id: Ie2cc9bdf696f24337593a07a75ad78c5c734db1b

create/avd_spec.py

diff --git a/create/avd_spec.py b/create/avd_spec.py
index 83f1c81..5f8e6e1 100644
--- a/create/avd_spec.py
+++ b/create/avd_spec.py
@@ -383,7 +383,7 @@
         return "%s%s_%s_%s-%s" % (
             _BRANCH_TARGET_PREFIX.get(branch, ""),
             constants.AVD_TYPES_MAPPING[args.avd_type],
-            _DEFAULT_BUILD_BITNESS, args.flavor,
+            _DEFAULT_BUILD_BITNESS, self._flavor,
             _DEFAULT_BUILD_TYPE)
 
     @property

create/avd_spec_test.py

diff --git a/create/avd_spec_test.py b/create/avd_spec_test.py
index bd9ae4c..91dd7e2 100644
--- a/create/avd_spec_test.py
+++ b/create/avd_spec_test.py
@@ -87,21 +87,21 @@
     def testGetBuildTarget(self):
         """Test get build target name."""
         self.AvdSpec._remote_image[avd_spec._BUILD_BRANCH] = "aosp-master"
-        self.args.flavor = constants.FLAVOR_IOT
+        self.AvdSpec._flavor = constants.FLAVOR_IOT
         self.args.avd_type = constants.TYPE_GCE
         self.assertEqual(
             self.AvdSpec._GetBuildTarget(self.args),
             "aosp_gce_x86_iot-userdebug")
 
         self.AvdSpec._remote_image[avd_spec._BUILD_BRANCH] = "aosp-master"
-        self.args.flavor = constants.FLAVOR_PHONE
+        self.AvdSpec._flavor = constants.FLAVOR_PHONE
         self.args.avd_type = constants.TYPE_CF
         self.assertEqual(
             self.AvdSpec._GetBuildTarget(self.args),
             "aosp_cf_x86_phone-userdebug")
 
         self.AvdSpec._remote_image[avd_spec._BUILD_BRANCH] = "git_branch"
-        self.args.flavor = constants.FLAVOR_PHONE
+        self.AvdSpec._flavor = constants.FLAVOR_PHONE
         self.args.avd_type = constants.TYPE_CF
         self.assertEqual(
             self.AvdSpec._GetBuildTarget(self.args),