Do not prompt for Android emulator hardware profile

This commit is contained in:
Simon Sapin 2018-06-28 15:48:25 +02:00
parent f4d740f086
commit e54ad77594

View file

@ -109,14 +109,17 @@ class MachCommands(CommandBase):
"emulator", "emulator",
image, image,
]) ])
subprocess.check_call([ subprocess.Popen(
stdin=subprocess.PIPE, args=[
path.join(tools_path, "tools", "bin", "avdmanager"), path.join(tools_path, "tools", "bin", "avdmanager"),
"create", "avd", "create", "avd",
"--path", path.join(toolchains, "avd", avd_name), "--path", path.join(toolchains, "avd", avd_name),
"--name", avd_name, "--name", avd_name,
"--package", image, "--package", image,
"--force", "--force",
]) ]
# This command always prompts "Do you wish to create a custom hardware profile?"
).communicate("no\n")
with open(path.join(toolchains, "avd", avd_name, "config.ini"), "a") as f: with open(path.join(toolchains, "avd", avd_name, "config.ini"), "a") as f:
f.write("disk.dataPartition.size=1G\n") f.write("disk.dataPartition.size=1G\n")
@ -124,6 +127,7 @@ class MachCommands(CommandBase):
assert len(contents) == 1 assert len(contents) == 1
ndk_path = path.join(ndk_path, contents[0]) ndk_path = path.join(ndk_path, contents[0])
print("")
print("") print("")
print("export ANDROID_SDK=\"%s\"" % tools_path) print("export ANDROID_SDK=\"%s\"" % tools_path)
print("export ANDROID_NDK=\"%s\"" % ndk_path) print("export ANDROID_NDK=\"%s\"" % ndk_path)