perfetto: switch arm/arm64 emulators over to x64
Bug: None
Change-Id: If45a6cede3fde982088fe04e47d26f23b0294709
diff --git a/tools/run_android_emulator b/tools/run_android_emulator
index 6a923c7..4f6d151 100755
--- a/tools/run_android_emulator
+++ b/tools/run_android_emulator
@@ -23,38 +23,28 @@
parser = argparse.ArgumentParser()
parser.add_argument('--verbose', '-v', action='store_true')
parser.add_argument('--pid', help='(optional) save pid into given file')
- parser.add_argument('image', help='arm|arm64 (see //tools/android_emulators)')
args = parser.parse_args()
root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
- ini = os.path.join(root_dir, 'tools', 'android_emulators', args.image + '.ini')
- assert os.path.exists(ini), 'File not found: ' + ini
+ emulator_root = os.path.join(
+ root_dir, 'buildtools', 'emulator', 'linux-x86_64')
+ emulator_path = os.path.join(emulator_root, 'qemu', 'linux-x86_64')
+ aosp_path = os.path.join(root_dir, 'buildtools', 'aosp-arm')
- avd_dir = os.path.join(root_dir, 'buildtools', 'emulator_images')
- if not os.path.exists(avd_dir):
- os.makedirs(avd_dir)
-
- emu_img_dir = os.path.join(avd_dir, args.image + '.avd')
- if not os.path.exists(emu_img_dir):
- os.makedirs(emu_img_dir)
- shutil.copyfile(ini, os.path.join(emu_img_dir, 'config.ini'))
-
- with open(os.path.join(avd_dir, args.image + '.ini'), 'w') as f:
- f.write('path=' + emu_img_dir)
-
- sdk_dir = os.path.join(root_dir, 'buildtools', 'android_sdk')
env = {
# Travis CI doesn't set this and causes the emulator to fallback in
# 32-bit mode with a "Cannot decide host bitness because $SHELL" error.
'SHELL': '/bin/bash',
- 'ANDROID_EMULATOR_DEBUG': '1' if args.verbose else '0',
- 'ANDROID_SDK_ROOT': sdk_dir,
- 'ANDROID_AVD_HOME': avd_dir,
- 'DYLD_LIBRARY_PATH': os.path.join(sdk_dir, 'tools', 'lib64', 'qt', 'lib'),
+ 'LD_LIBRARY_PATH': os.path.join(emulator_root, 'lib64', 'qt', 'lib'),
}
- emulator_bin = os.path.join(sdk_dir, 'tools', 'emulator')
- emulator_args = ['-no-window', '-no-snapshot', '-gpu', 'off', '-wipe-data',
- '-avd', args.image]
+ emulator_bin = os.path.join(emulator_path, 'qemu-system-armel')
+ emulator_args = ['-no-window', '-no-snapshot', '-gpu', 'off', '-no-accel',
+ '-sysdir', aosp_path,
+ '-system', os.path.join(aosp_path, 'system-qemu.img'),
+ '-kernel', os.path.join(aosp_path, 'kernel-ranchu'),
+ '-ramdisk', os.path.join(aosp_path, 'ramdisk.img'),
+ '-vendor', os.path.join(aosp_path, 'vendor-qemu.img'),
+ '-data', os.path.join(aosp_path, 'userdata-qemu.img')]
print '\n'.join('='.join(x) for x in env.items())
print ' '.join([emulator_bin] + emulator_args)
if args.pid: