| 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 |
| 11 from pylib import cmd_helper | 11 from pylib import cmd_helper |
| 12 from pylib import constants | 12 from pylib import constants |
| 13 | 13 |
| 14 | 14 |
| 15 _ISOLATE_SCRIPT = os.path.join( | 15 _ISOLATE_SCRIPT = os.path.join( |
| 16 constants.DIR_SOURCE_ROOT, 'tools', 'swarming_client', 'isolate.py') | 16 constants.DIR_SOURCE_ROOT, 'tools', 'swarming_client', 'isolate.py') |
| 17 | 17 |
| 18 | 18 |
| 19 def DefaultPathVariables(): | 19 def DefaultPathVariables(): |
| 20 return { | 20 return { |
| 21 'DEPTH': constants.DIR_SOURCE_ROOT, | 21 'DEPTH': constants.DIR_SOURCE_ROOT, |
| 22 'PRODUCT_DIR': constants.GetOutDirectory(), | 22 'PRODUCT_DIR': constants.GetOutDirectory(), |
| 23 } | 23 } |
| 24 | 24 |
| 25 | 25 |
| 26 def DefaultConfigVariables(): | 26 def DefaultConfigVariables(): |
| 27 # Note: This list must match the --config-vars in build/isolate.gypi |
| 27 return { | 28 return { |
| 28 'CONFIGURATION_NAME': constants.GetBuildType(), | 29 'CONFIGURATION_NAME': constants.GetBuildType(), |
| 29 'OS': 'android', | 30 'OS': 'android', |
| 30 'asan': '0', | 31 'asan': '0', |
| 31 'chromeos': '0', | 32 'chromeos': '0', |
| 32 'component': 'static_library', | 33 'component': 'static_library', |
| 33 'enable_plugins': '0', | 34 'enable_plugins': '0', |
| 34 'fastbuild': '0', | 35 'fastbuild': '0', |
| 35 'icu_use_data_file_flag': '1', | 36 'icu_use_data_file_flag': '1', |
| 36 'lsan': '0', | 37 'lsan': '0', |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 shutil.move(os.path.join(root, filename), paks_dir) | 161 shutil.move(os.path.join(root, filename), paks_dir) |
| 161 | 162 |
| 162 # Move everything in PRODUCT_DIR to top level. | 163 # Move everything in PRODUCT_DIR to top level. |
| 163 deps_product_dir = os.path.join(deps_out_dir, constants.GetBuildType()) | 164 deps_product_dir = os.path.join(deps_out_dir, constants.GetBuildType()) |
| 164 if os.path.isdir(deps_product_dir): | 165 if os.path.isdir(deps_product_dir): |
| 165 for p in os.listdir(deps_product_dir): | 166 for p in os.listdir(deps_product_dir): |
| 166 shutil.move(os.path.join(deps_product_dir, p), self._isolate_deps_dir) | 167 shutil.move(os.path.join(deps_product_dir, p), self._isolate_deps_dir) |
| 167 os.rmdir(deps_product_dir) | 168 os.rmdir(deps_product_dir) |
| 168 os.rmdir(deps_out_dir) | 169 os.rmdir(deps_out_dir) |
| 169 | 170 |
| OLD | NEW |