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

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

Issue 1057153002: content_browsertests.isolate: ppapi_tests requires enable_plugins=1. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: back to enable_plugins, updating isolate args Created 5 years, 8 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 | « no previous file | build/isolate.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 12 matching lines...) Expand all
23 } 23 }
24 24
25 25
26 def DefaultConfigVariables(): 26 def DefaultConfigVariables():
27 return { 27 return {
28 'CONFIGURATION_NAME': constants.GetBuildType(), 28 'CONFIGURATION_NAME': constants.GetBuildType(),
29 'OS': 'android', 29 'OS': 'android',
30 'asan': '0', 30 'asan': '0',
31 'chromeos': '0', 31 'chromeos': '0',
32 'component': 'static_library', 32 'component': 'static_library',
33 'enable_plugins': '0',
33 'fastbuild': '0', 34 'fastbuild': '0',
34 'icu_use_data_file_flag': '1', 35 'icu_use_data_file_flag': '1',
35 'lsan': '0', 36 'lsan': '0',
36 'msan': '0', 37 'msan': '0',
37 # TODO(maruel): This may not always be true. 38 # TODO(maruel): This may not always be true.
38 'target_arch': 'arm', 39 'target_arch': 'arm',
39 'tsan': '0', 40 'tsan': '0',
40 'use_custom_libcxx': '0', 41 'use_custom_libcxx': '0',
41 'use_instrumented_libraries': '0', 42 'use_instrumented_libraries': '0',
42 'use_prebuilt_instrumented_libraries': '0', 43 'use_prebuilt_instrumented_libraries': '0',
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 shutil.move(os.path.join(root, filename), paks_dir) 160 shutil.move(os.path.join(root, filename), paks_dir)
160 161
161 # Move everything in PRODUCT_DIR to top level. 162 # Move everything in PRODUCT_DIR to top level.
162 deps_product_dir = os.path.join(deps_out_dir, constants.GetBuildType()) 163 deps_product_dir = os.path.join(deps_out_dir, constants.GetBuildType())
163 if os.path.isdir(deps_product_dir): 164 if os.path.isdir(deps_product_dir):
164 for p in os.listdir(deps_product_dir): 165 for p in os.listdir(deps_product_dir):
165 shutil.move(os.path.join(deps_product_dir, p), self._isolate_deps_dir) 166 shutil.move(os.path.join(deps_product_dir, p), self._isolate_deps_dir)
166 os.rmdir(deps_product_dir) 167 os.rmdir(deps_product_dir)
167 os.rmdir(deps_out_dir) 168 os.rmdir(deps_out_dir)
168 169
OLDNEW
« no previous file with comments | « no previous file | build/isolate.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698