diff options
Diffstat (limited to 'public/actions/create_goldfish_action.py')
| -rw-r--r-- | public/actions/create_goldfish_action.py | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/public/actions/create_goldfish_action.py b/public/actions/create_goldfish_action.py index 069b9d93..d4617433 100644 --- a/public/actions/create_goldfish_action.py +++ b/public/actions/create_goldfish_action.py @@ -159,6 +159,7 @@ class GoldfishDeviceFactory(base_device_factory.BaseDeviceFactory): build_id=self.build_info.build_id, emulator_branch=self.emulator_build_info.branch, emulator_build_id=self.emulator_build_info.build_id, + emulator_build_target=self.emulator_build_info.build_target, kernel_branch=self.kernel_build_info.branch, kernel_build_id=self.kernel_build_info.build_id, kernel_build_target=self.kernel_build_info.build_target, @@ -234,6 +235,7 @@ def CreateDevices(avd_spec=None, build_id=None, emulator_build_id=None, emulator_branch=None, + emulator_build_target=None, kernel_build_id=None, kernel_branch=None, kernel_build_target=None, @@ -254,7 +256,8 @@ def CreateDevices(avd_spec=None, build_id: String, Build id, e.g. "2263051", "P2804227" branch: String, Branch name for system image. emulator_build_id: String, emulator build id. - emulator_branch: String, Emulator branch name. + emulator_branch: String, emulator branch name. + emulator_build_target: String, emulator build target. gpu: String, GPU to attach to the device or None. e.g. "nvidia-k80" kernel_build_id: Kernel build id, a string. kernel_branch: Kernel branch name, a string. @@ -283,6 +286,7 @@ def CreateDevices(avd_spec=None, branch = avd_spec.remote_image[constants.BUILD_BRANCH] num = avd_spec.num emulator_build_id = avd_spec.emulator_build_id + emulator_build_target = avd_spec.emulator_build_target gpu = avd_spec.gpu serial_log_file = avd_spec.serial_log_file autoconnect = avd_spec.autoconnect @@ -290,12 +294,15 @@ def CreateDevices(avd_spec=None, client_adb_port = avd_spec.client_adb_port boot_timeout_secs = avd_spec.boot_timeout_secs + if not emulator_build_target: + emulator_build_target = cfg.emulator_build_target + # If emulator_build_id and emulator_branch is None, retrieve emulator # build id from platform build emulator-info.txt artifact # Example: require version-emulator=5292001 if not emulator_build_id and not emulator_branch: logger.info("emulator_build_id not provided. " - "Try to get %s from build %s/%s.", _EMULATOR_INFO_FILENAME, + "Attempting to get %s from build %s/%s.", _EMULATOR_INFO_FILENAME, build_id, build_target) emulator_build_id = _FetchBuildIdFromFile(cfg, build_target, @@ -311,7 +318,7 @@ def CreateDevices(avd_spec=None, # Example: version-sysimage-git_pi-dev-sdk_gphone_x86_64-userdebug=4833817 if not build_id and not branch: build_id = _FetchBuildIdFromFile(cfg, - cfg.emulator_build_target, + emulator_build_target, emulator_build_id, _SYSIMAGE_INFO_FILENAME) @@ -320,16 +327,16 @@ def CreateDevices(avd_spec=None, "in %s" % _SYSIMAGE_INFO_FILENAME) logger.info( "Creating a goldfish device in project %s, build_target: %s, " - "build_id: %s, emulator_bid: %s, kernel_build_id: %s, " + "build_id: %s, emulator_bid: %s, emulator_branch: %s, kernel_build_id: %s, " "kernel_branch: %s, kernel_build_target: %s, GPU: %s, num: %s, " "serial_log_file: %s, " "autoconnect: %s", cfg.project, build_target, build_id, - emulator_build_id, kernel_build_id, kernel_branch, kernel_build_target, - gpu, num, serial_log_file, autoconnect) + emulator_build_id, emulator_branch, kernel_build_id, kernel_branch, + kernel_build_target, gpu, num, serial_log_file, autoconnect) device_factory = GoldfishDeviceFactory( cfg, build_target, build_id, - cfg.emulator_build_target, + emulator_build_target, emulator_build_id, gpu=gpu, avd_spec=avd_spec, tags=tags, branch=branch, |