OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import fnmatch | 5 import fnmatch |
6 import glob | 6 import glob |
7 import os | 7 import os |
8 import shutil | 8 import shutil |
9 import sys | 9 import sys |
10 import tempfile | 10 import tempfile |
(...skipping 29 matching lines...) Expand all Loading... |
40 'icu_use_data_file_flag': '1', | 40 'icu_use_data_file_flag': '1', |
41 'kasko': '0', | 41 'kasko': '0', |
42 'lsan': '0', | 42 'lsan': '0', |
43 'msan': '0', | 43 'msan': '0', |
44 # TODO(maruel): This may not always be true. | 44 # TODO(maruel): This may not always be true. |
45 'target_arch': 'arm', | 45 'target_arch': 'arm', |
46 'tsan': '0', | 46 'tsan': '0', |
47 'use_custom_libcxx': '0', | 47 'use_custom_libcxx': '0', |
48 'use_instrumented_libraries': '0', | 48 'use_instrumented_libraries': '0', |
49 'use_prebuilt_instrumented_libraries': '0', | 49 'use_prebuilt_instrumented_libraries': '0', |
50 'use_openssl': '0', | |
51 'use_ozone': '0', | 50 'use_ozone': '0', |
52 'use_x11': '0', | 51 'use_x11': '0', |
53 'v8_use_external_startup_data': '1', | 52 'v8_use_external_startup_data': '1', |
54 'msvs_version': '0', | 53 'msvs_version': '0', |
55 } | 54 } |
56 | 55 |
57 | 56 |
58 class Isolator(object): | 57 class Isolator(object): |
59 """Manages calls to isolate.py for the android test runner scripts.""" | 58 """Manages calls to isolate.py for the android test runner scripts.""" |
60 | 59 |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
167 shutil.move(os.path.join(root, filename), paks_dir) | 166 shutil.move(os.path.join(root, filename), paks_dir) |
168 | 167 |
169 # Move everything in PRODUCT_DIR to top level. | 168 # Move everything in PRODUCT_DIR to top level. |
170 deps_product_dir = os.path.join( | 169 deps_product_dir = os.path.join( |
171 deps_out_dir, os.path.basename(constants.GetOutDirectory())) | 170 deps_out_dir, os.path.basename(constants.GetOutDirectory())) |
172 if os.path.isdir(deps_product_dir): | 171 if os.path.isdir(deps_product_dir): |
173 for p in os.listdir(deps_product_dir): | 172 for p in os.listdir(deps_product_dir): |
174 shutil.move(os.path.join(deps_product_dir, p), self._isolate_deps_dir) | 173 shutil.move(os.path.join(deps_product_dir, p), self._isolate_deps_dir) |
175 os.rmdir(deps_product_dir) | 174 os.rmdir(deps_product_dir) |
176 os.rmdir(deps_out_dir) | 175 os.rmdir(deps_out_dir) |
177 | |
OLD | NEW |