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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
84 device_scratch_dir = shell_utils.Bash( | 84 device_scratch_dir = shell_utils.Bash( |
85 '%s -s %s shell echo \$EXTERNAL_STORAGE' % ( | 85 '%s -s %s shell echo \$EXTERNAL_STORAGE' % ( |
86 android_utils.PATH_TO_ADB, self._serial), | 86 android_utils.PATH_TO_ADB, self._serial), |
87 echo=True, shell=True).rstrip().split('\n')[-1] | 87 echo=True, shell=True).rstrip().split('\n')[-1] |
88 super(AndroidBuildStep, self).__init__(args=args, **kwargs) | 88 super(AndroidBuildStep, self).__init__(args=args, **kwargs) |
89 prefix = posixpath.join(device_scratch_dir, 'skiabot', 'skia_') | 89 prefix = posixpath.join(device_scratch_dir, 'skiabot', 'skia_') |
90 self._device_dirs = DeviceDirs(perf_data_dir=prefix + 'perf', | 90 self._device_dirs = DeviceDirs(perf_data_dir=prefix + 'perf', |
91 gm_actual_dir=prefix + 'gm_actual', | 91 gm_actual_dir=prefix + 'gm_actual', |
92 gm_expected_dir=prefix + 'gm_expected', | 92 gm_expected_dir=prefix + 'gm_expected', |
93 resource_dir=prefix + 'resources', | 93 resource_dir=prefix + 'resources', |
94 skimage_in_dir=prefix + 'skimage_in', | |
95 skimage_expected_dir=prefix + 'skimage_expect ed', | |
borenet
2013/06/25 18:19:12
Nit: 80 chars
scroggo
2013/06/25 19:28:56
Done.
| |
96 skimage_out_dir=prefix + 'skimage_out', | |
94 skp_dir=prefix + 'skp', | 97 skp_dir=prefix + 'skp', |
95 skp_perf_dir=prefix + 'skp_perf', | 98 skp_perf_dir=prefix + 'skp_perf', |
96 skp_out_dir=prefix + 'skp_out', | 99 skp_out_dir=prefix + 'skp_out', |
97 tmp_dir=prefix + 'tmp_dir') | 100 tmp_dir=prefix + 'tmp_dir') |
OLD | NEW |