diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
| commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
| tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/v8/tools/android-run.py | |
| parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
| download | qtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz | |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/v8/tools/android-run.py')
| -rwxr-xr-x | chromium/v8/tools/android-run.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/v8/tools/android-run.py b/chromium/v8/tools/android-run.py index dc1359883a1..4765f86b4c0 100755 --- a/chromium/v8/tools/android-run.py +++ b/chromium/v8/tools/android-run.py @@ -88,7 +88,8 @@ def Main(): print("Usage: %s <command-to-run-on-device>" % sys.argv[0]) return 1 workspace = abspath(join(dirname(sys.argv[0]), '..')) - android_workspace = os.getenv("ANDROID_V8", "/data/local/tmp/v8") + v8_root = "/data/local/tmp/v8" + android_workspace = os.getenv("ANDROID_V8", v8_root) args = [Escape(arg) for arg in sys.argv[1:]] script = (" ".join(args) + "\n" "case $? in\n" @@ -99,7 +100,7 @@ def Main(): script_file = WriteToTemporaryFile(script) android_script_file = android_workspace + "/" + script_file command = ("adb push '%s' %s;" % (script_file, android_script_file) + - "adb shell 'sh %s';" % android_script_file + + "adb shell 'cd %s && sh %s';" % (v8_root, android_script_file) + "adb shell 'rm %s'" % android_script_file) error_code = Execute(command) os.unlink(script_file) |