Commit 6ab1352c authored by Fabrice de Gans-Riberi's avatar Fabrice de Gans-Riberi Committed by Commit Bot

[fuchsia] Remove _GetTargetSdkLegacyArch()

This is only used in one place for qemu. Use the implementation
directly for this one usage.

Bug: 1104411
Change-Id: Ifcc86426a87abbcbe8e539c2f028a7bdcc24dd38
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427036Reviewed-by: default avatarKevin Marshall <kmarshall@chromium.org>
Commit-Queue: Fabrice de Gans-Riberi <fdegans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810061}
parent abec25d0
...@@ -165,7 +165,13 @@ class QemuTarget(emu_target.EmuTarget): ...@@ -165,7 +165,13 @@ class QemuTarget(emu_target.EmuTarget):
return emu_command return emu_command
def _BuildCommand(self): def _BuildCommand(self):
qemu_exec = 'qemu-system-'+self._GetTargetSdkLegacyArch() if self._target_cpu == 'arm64':
qemu_exec = 'qemu-system-' + 'aarch64'
elif self._target_cpu == 'x64':
qemu_exec = 'qemu-system-' + 'x86_64'
else:
raise Exception('Unknown target_cpu %s:' % self._target_cpu)
qemu_command = [ qemu_command = [
os.path.join(GetEmuRootForPlatform(self.EMULATOR_NAME), 'bin', os.path.join(GetEmuRootForPlatform(self.EMULATOR_NAME), 'bin',
qemu_exec) qemu_exec)
......
...@@ -246,16 +246,6 @@ class Target(object): ...@@ -246,16 +246,6 @@ class Target(object):
def _GetSshConfigPath(self, path): def _GetSshConfigPath(self, path):
raise NotImplementedError raise NotImplementedError
# TODO: remove this once all instances of architecture names have been
# converted to the new naming pattern.
def _GetTargetSdkLegacyArch(self):
"""Returns the Fuchsia SDK architecture name for the target CPU."""
if self._target_cpu == 'arm64':
return 'aarch64'
elif self._target_cpu == 'x64':
return 'x86_64'
raise Exception('Unknown target_cpu %s:' % self._target_cpu)
def GetAmberRepo(self): def GetAmberRepo(self):
"""Returns an AmberRepo instance which serves packages for this Target. """Returns an AmberRepo instance which serves packages for this Target.
Callers should typically call GetAmberRepo() in a |with| statement, and Callers should typically call GetAmberRepo() in a |with| statement, and
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment