| 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 | 10 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 # TODO(maruel): This may not always be true. | 42 # TODO(maruel): This may not always be true. |
| 43 'target_arch': 'arm', | 43 'target_arch': 'arm', |
| 44 'tsan': '0', | 44 'tsan': '0', |
| 45 'use_custom_libcxx': '0', | 45 'use_custom_libcxx': '0', |
| 46 'use_instrumented_libraries': '0', | 46 'use_instrumented_libraries': '0', |
| 47 'use_prebuilt_instrumented_libraries': '0', | 47 'use_prebuilt_instrumented_libraries': '0', |
| 48 'use_openssl': '0', | 48 'use_openssl': '0', |
| 49 'use_ozone': '0', | 49 'use_ozone': '0', |
| 50 'use_x11': '0', | 50 'use_x11': '0', |
| 51 'v8_use_external_startup_data': '1', | 51 'v8_use_external_startup_data': '1', |
| 52 'msvs_version': '0', |
| 52 } | 53 } |
| 53 | 54 |
| 54 | 55 |
| 55 class Isolator(object): | 56 class Isolator(object): |
| 56 """Manages calls to isolate.py for the android test runner scripts.""" | 57 """Manages calls to isolate.py for the android test runner scripts.""" |
| 57 | 58 |
| 58 def __init__(self, isolate_deps_dir): | 59 def __init__(self, isolate_deps_dir): |
| 59 """ | 60 """ |
| 60 Args: | 61 Args: |
| 61 isolate_deps_dir: The directory in which dependencies specified by | 62 isolate_deps_dir: The directory in which dependencies specified by |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 shutil.move(os.path.join(root, filename), paks_dir) | 165 shutil.move(os.path.join(root, filename), paks_dir) |
| 165 | 166 |
| 166 # Move everything in PRODUCT_DIR to top level. | 167 # Move everything in PRODUCT_DIR to top level. |
| 167 deps_product_dir = os.path.join(deps_out_dir, constants.GetBuildType()) | 168 deps_product_dir = os.path.join(deps_out_dir, constants.GetBuildType()) |
| 168 if os.path.isdir(deps_product_dir): | 169 if os.path.isdir(deps_product_dir): |
| 169 for p in os.listdir(deps_product_dir): | 170 for p in os.listdir(deps_product_dir): |
| 170 shutil.move(os.path.join(deps_product_dir, p), self._isolate_deps_dir) | 171 shutil.move(os.path.join(deps_product_dir, p), self._isolate_deps_dir) |
| 171 os.rmdir(deps_product_dir) | 172 os.rmdir(deps_product_dir) |
| 172 os.rmdir(deps_out_dir) | 173 os.rmdir(deps_out_dir) |
| 173 | 174 |
| OLD | NEW |