Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(250)

Side by Side Diff: build/android/pylib/utils/isolator.py

Issue 1001833005: Update from https://crrev.com/320343 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Supress Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/android/pylib/remote/device/remote_device_environment.py ('k') | build/common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 23 matching lines...) Expand all
34 'icu_use_data_file_flag': '1', 34 'icu_use_data_file_flag': '1',
35 'lsan': '0', 35 'lsan': '0',
36 'msan': '0', 36 'msan': '0',
37 # TODO(maruel): This may not always be true. 37 # TODO(maruel): This may not always be true.
38 'target_arch': 'arm', 38 'target_arch': 'arm',
39 'tsan': '0', 39 'tsan': '0',
40 'use_custom_libcxx': '0', 40 'use_custom_libcxx': '0',
41 'use_instrumented_libraries': '0', 41 'use_instrumented_libraries': '0',
42 'use_openssl': '0', 42 'use_openssl': '0',
43 'use_ozone': '0', 43 'use_ozone': '0',
44 'use_x11': '0',
44 'v8_use_external_startup_data': '1', 45 'v8_use_external_startup_data': '1',
45 } 46 }
46 47
47 48
48 class Isolator(object): 49 class Isolator(object):
49 """Manages calls to isolate.py for the android test runner scripts.""" 50 """Manages calls to isolate.py for the android test runner scripts."""
50 51
51 def __init__(self, isolate_deps_dir): 52 def __init__(self, isolate_deps_dir):
52 """ 53 """
53 Args: 54 Args:
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 shutil.move(os.path.join(root, filename), paks_dir) 158 shutil.move(os.path.join(root, filename), paks_dir)
158 159
159 # Move everything in PRODUCT_DIR to top level. 160 # Move everything in PRODUCT_DIR to top level.
160 deps_product_dir = os.path.join(deps_out_dir, constants.GetBuildType()) 161 deps_product_dir = os.path.join(deps_out_dir, constants.GetBuildType())
161 if os.path.isdir(deps_product_dir): 162 if os.path.isdir(deps_product_dir):
162 for p in os.listdir(deps_product_dir): 163 for p in os.listdir(deps_product_dir):
163 shutil.move(os.path.join(deps_product_dir, p), self._isolate_deps_dir) 164 shutil.move(os.path.join(deps_product_dir, p), self._isolate_deps_dir)
164 os.rmdir(deps_product_dir) 165 os.rmdir(deps_product_dir)
165 os.rmdir(deps_out_dir) 166 os.rmdir(deps_out_dir)
166 167
OLDNEW
« no previous file with comments | « build/android/pylib/remote/device/remote_device_environment.py ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698