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 27 matching lines...) Expand all Loading... | |
38 # TODO(maruel): This may not always be true. | 38 # TODO(maruel): This may not always be true. |
39 'target_arch': 'arm', | 39 'target_arch': 'arm', |
40 'tsan': '0', | 40 'tsan': '0', |
41 'use_custom_libcxx': '0', | 41 'use_custom_libcxx': '0', |
42 'use_instrumented_libraries': '0', | 42 'use_instrumented_libraries': '0', |
43 'use_prebuilt_instrumented_libraries': '0', | 43 'use_prebuilt_instrumented_libraries': '0', |
44 'use_openssl': '0', | 44 'use_openssl': '0', |
45 'use_ozone': '0', | 45 'use_ozone': '0', |
46 'use_x11': '0', | 46 'use_x11': '0', |
47 'v8_use_external_startup_data': '1', | 47 'v8_use_external_startup_data': '1', |
48 'branding': 'none', | |
M-A Ruel
2015/04/07 22:03:20
please sort
use chromium instead or whatever defau
jrummell
2015/04/07 22:11:41
Done.
| |
49 'enable_pepper_cdms': '0', | |
48 } | 50 } |
49 | 51 |
50 | 52 |
51 class Isolator(object): | 53 class Isolator(object): |
52 """Manages calls to isolate.py for the android test runner scripts.""" | 54 """Manages calls to isolate.py for the android test runner scripts.""" |
53 | 55 |
54 def __init__(self, isolate_deps_dir): | 56 def __init__(self, isolate_deps_dir): |
55 """ | 57 """ |
56 Args: | 58 Args: |
57 isolate_deps_dir: The directory in which dependencies specified by | 59 isolate_deps_dir: The directory in which dependencies specified by |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
160 shutil.move(os.path.join(root, filename), paks_dir) | 162 shutil.move(os.path.join(root, filename), paks_dir) |
161 | 163 |
162 # Move everything in PRODUCT_DIR to top level. | 164 # Move everything in PRODUCT_DIR to top level. |
163 deps_product_dir = os.path.join(deps_out_dir, constants.GetBuildType()) | 165 deps_product_dir = os.path.join(deps_out_dir, constants.GetBuildType()) |
164 if os.path.isdir(deps_product_dir): | 166 if os.path.isdir(deps_product_dir): |
165 for p in os.listdir(deps_product_dir): | 167 for p in os.listdir(deps_product_dir): |
166 shutil.move(os.path.join(deps_product_dir, p), self._isolate_deps_dir) | 168 shutil.move(os.path.join(deps_product_dir, p), self._isolate_deps_dir) |
167 os.rmdir(deps_product_dir) | 169 os.rmdir(deps_product_dir) |
168 os.rmdir(deps_out_dir) | 170 os.rmdir(deps_out_dir) |
169 | 171 |
OLD | NEW |