Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-29 18:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

new android port: fix android build and tests

Browse source
This commit is contained in:
Paul Rouget 2018-07-31 22:38:54 +08:00
parent 76d394eca8
commit bef2fe83cd
9 changed files with 43 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

20
python/servo/post_build_commands.py
View file

@ -9,6 +9,7 @@
from __future__ import print_function, unicode_literals
import json
import os
import os.path as path
import subprocess
@ -34,6 +35,13 @@ def read_file(filename, if_exists=False):
return f.read()
# Copied from Python 3.3+'s shlex.quote()
def shell_quote(arg):
# use single quotes, and put single quotes into double quotes
# the string $'b is then quoted as '$'"'"'b'
return "'" + arg.replace("'", "'\"'\"'") + "'"
@CommandProvider
class PostBuildCommands(CommandBase):
@Command('run',
@ -88,15 +96,11 @@ class PostBuildCommands(CommandBase):
return
script = [
"am force-stop com.mozilla.servo",
"echo servo >/sdcard/Android/data/com.mozilla.servo/files/android_params"
]
for param in params:
script += [
"echo '%s' >>/sdcard/Android/data/com.mozilla.servo/files/android_params"
% param.replace("'", "\\'")
]
json_params = shell_quote(json.dumps(params))
extra = "-e servoargs " + json_params
script += [
"am start com.mozilla.servo/com.mozilla.servo.MainActivity",
"am start " + extra + " com.mozilla.servo/com.mozilla.servo.MainActivity",
"sleep 0.5",
"echo Servo PID: $(pidof com.mozilla.servo)",
"exit"
@ -257,7 +261,7 @@ class PostBuildCommands(CommandBase):
copy2(full_name, destination)
return self.call_rustup_run(
["cargo", "doc", "--manifest-path", self.servo_manifest()] + params,
["cargo", "doc", "--manifest-path", self.ports_servo_manifest()] + params,
env=self.build_env()
)