diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-06-28 15:48:25 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-07-02 13:25:44 +0200 |
| commit | e54ad7759432c35d44bc6f6a7fb4a948269c540f (patch) | |
| tree | 883881f21d2ec99e555c8a268568e71639f6d687 /python/servo/bootstrap_commands.py | |
| parent | f4d740f08664c3800a8044279dcc41c6c69d8bcd (diff) | |
| download | servo-e54ad7759432c35d44bc6f6a7fb4a948269c540f.tar.gz servo-e54ad7759432c35d44bc6f6a7fb4a948269c540f.zip | |
Do not prompt for Android emulator hardware profile
Diffstat (limited to 'python/servo/bootstrap_commands.py')
| -rw-r--r-- | python/servo/bootstrap_commands.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index dcc278797a2..973d89d7632 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -109,14 +109,17 @@ class MachCommands(CommandBase): "emulator", image, ]) - subprocess.check_call([ - path.join(tools_path, "tools", "bin", "avdmanager"), - "create", "avd", - "--path", path.join(toolchains, "avd", avd_name), - "--name", avd_name, - "--package", image, - "--force", - ]) + subprocess.Popen( + stdin=subprocess.PIPE, args=[ + path.join(tools_path, "tools", "bin", "avdmanager"), + "create", "avd", + "--path", path.join(toolchains, "avd", avd_name), + "--name", avd_name, + "--package", image, + "--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: f.write("disk.dataPartition.size=1G\n") @@ -125,6 +128,7 @@ class MachCommands(CommandBase): ndk_path = path.join(ndk_path, contents[0]) print("") + print("") print("export ANDROID_SDK=\"%s\"" % tools_path) print("export ANDROID_NDK=\"%s\"" % ndk_path) print("export PATH=\"%s:$PATH\"" % path.join(tools_path, "platform-tools")) |