OLD | NEW |
---|---|
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 """ Subclass for all slave-side Android build steps. """ | 5 """ Subclass for all slave-side Android build steps. """ |
6 | 6 |
7 from build_step import BuildStep, DeviceDirs | 7 from build_step import BuildStep, DeviceDirs |
8 from utils import android_utils | 8 from utils import android_utils |
9 from utils import gs_utils | 9 from utils import gs_utils |
10 from utils import shell_utils | 10 from utils import shell_utils |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
45 raise Exception('Failed to remove %s' % directory) | 45 raise Exception('Failed to remove %s' % directory) |
46 | 46 |
47 def _CreateDirectoryOnDevice(self, directory): | 47 def _CreateDirectoryOnDevice(self, directory): |
48 """ Create a directory on the device. """ | 48 """ Create a directory on the device. """ |
49 android_utils.RunADB(self._serial, ['shell', 'mkdir', '-p', directory]) | 49 android_utils.RunADB(self._serial, ['shell', 'mkdir', '-p', directory]) |
50 | 50 |
51 def PushFileToDevice(self, src, dst): | 51 def PushFileToDevice(self, src, dst): |
52 """ Overrides build_step.PushFileToDevice() """ | 52 """ Overrides build_step.PushFileToDevice() """ |
53 android_utils.RunADB(self._serial, ['push', src, dst]) | 53 android_utils.RunADB(self._serial, ['push', src, dst]) |
54 | 54 |
55 def DevicePathExists(self, path): | |
56 """ Overrides build_step.DevicePathExists() """ | |
57 return posixpath.exists(path) | |
borenet
2013/06/26 18:47:31
You'll need to run something in the ADB shell to d
scroggo
2013/06/26 20:07:08
Done.
| |
58 | |
55 def DevicePathJoin(self, *args): | 59 def DevicePathJoin(self, *args): |
56 """ Overrides build_step.DevicePathJoin() """ | 60 """ Overrides build_step.DevicePathJoin() """ |
57 return posixpath.sep.join(args) | 61 return posixpath.sep.join(args) |
58 | 62 |
59 def CreateCleanDirectory(self, directory): | 63 def CreateCleanDirectory(self, directory): |
60 self._RemoveDirectoryOnDevice(directory) | 64 self._RemoveDirectoryOnDevice(directory) |
61 self._CreateDirectoryOnDevice(directory) | 65 self._CreateDirectoryOnDevice(directory) |
62 | 66 |
63 def CopyDirectoryContentsToDevice(self, host_dir, device_dir): | 67 def CopyDirectoryContentsToDevice(self, host_dir, device_dir): |
64 """ Copy the contents of a host-side directory to a clean directory on the | 68 """ Copy the contents of a host-side directory to a clean directory on the |
(...skipping 19 matching lines...) Expand all Loading... | |
84 device_scratch_dir = shell_utils.Bash( | 88 device_scratch_dir = shell_utils.Bash( |
85 '%s -s %s shell echo \$EXTERNAL_STORAGE' % ( | 89 '%s -s %s shell echo \$EXTERNAL_STORAGE' % ( |
86 android_utils.PATH_TO_ADB, self._serial), | 90 android_utils.PATH_TO_ADB, self._serial), |
87 echo=True, shell=True).rstrip().split('\n')[-1] | 91 echo=True, shell=True).rstrip().split('\n')[-1] |
88 super(AndroidBuildStep, self).__init__(args=args, **kwargs) | 92 super(AndroidBuildStep, self).__init__(args=args, **kwargs) |
89 prefix = posixpath.join(device_scratch_dir, 'skiabot', 'skia_') | 93 prefix = posixpath.join(device_scratch_dir, 'skiabot', 'skia_') |
90 self._device_dirs = DeviceDirs(perf_data_dir=prefix + 'perf', | 94 self._device_dirs = DeviceDirs(perf_data_dir=prefix + 'perf', |
91 gm_actual_dir=prefix + 'gm_actual', | 95 gm_actual_dir=prefix + 'gm_actual', |
92 gm_expected_dir=prefix + 'gm_expected', | 96 gm_expected_dir=prefix + 'gm_expected', |
93 resource_dir=prefix + 'resources', | 97 resource_dir=prefix + 'resources', |
98 skimage_in_dir=prefix + 'skimage_in', | |
99 skimage_expected_dir=(prefix | |
100 + 'skimage_expected'), | |
101 skimage_out_dir=prefix + 'skimage_out', | |
94 skp_dir=prefix + 'skp', | 102 skp_dir=prefix + 'skp', |
95 skp_perf_dir=prefix + 'skp_perf', | 103 skp_perf_dir=prefix + 'skp_perf', |
96 skp_out_dir=prefix + 'skp_out', | 104 skp_out_dir=prefix + 'skp_out', |
97 tmp_dir=prefix + 'tmp_dir') | 105 tmp_dir=prefix + 'tmp_dir') |
OLD | NEW |