Include icu.isolate instead of listing icudt.dll
icu.isolate file added in https://codereview.chromium.org/99073008/ is used where icudt.dll is directly listed for 'isolate_dependency_tracked'. icu.isolate includes either icudtl.dat or icudt.dll depending on 'OS' and 'icu_use_data_file_flag'. Besides, 'icu_use_data_file_flag' is added to build/isolate.gypi as a config-variable. Once the above icu-side CL is checked in, this CL will also includes icu DEPS roll. This is a prerequisite for the following CLs to use icudtl.dat : Windows : https://codereview.chromium.org/99473012 Linux : https://codereview.chromium.org/102413007 Mac : https://codereview.chromium.org/109013004 BUG=72633 TEST=All tests utilizing isolate pass on bots. Review URL: https://codereview.chromium.org/124143002 git-svn-id: http://src.chromium.org/svn/trunk/src/build@245136 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
6867ff1017
Коммит
44c29acf5c
|
@ -108,6 +108,8 @@ def _GenerateDepsDirUsingIsolate(suite_name):
|
|||
isolated_abs_path = os.path.join(
|
||||
constants.GetOutDirectory(), '%s.isolated' % suite_name)
|
||||
assert os.path.exists(isolate_abs_path)
|
||||
# This needs to be kept in sync with the cmd line options for isolate.py
|
||||
# in src/build/isolate.gypi.
|
||||
isolate_cmd = [
|
||||
'python', _ISOLATE_SCRIPT,
|
||||
'remap',
|
||||
|
@ -115,6 +117,7 @@ def _GenerateDepsDirUsingIsolate(suite_name):
|
|||
'--isolated', isolated_abs_path,
|
||||
'--path-variable', 'PRODUCT_DIR', constants.GetOutDirectory(),
|
||||
'--config-variable', 'OS', 'android',
|
||||
'--config-variable', 'icu_use_data_file_flag', '0',
|
||||
'--outdir', constants.ISOLATE_DEPS_DIR,
|
||||
]
|
||||
assert not cmd_helper.RunCmd(isolate_cmd)
|
||||
|
|
|
@ -68,12 +68,15 @@
|
|||
'<(test_isolation_mode)',
|
||||
# Variables should use the -V FOO=<(FOO) form so frequent values,
|
||||
# like '0' or '1', aren't stripped out by GYP.
|
||||
# This list needs to be kept in sync with the cmd line options
|
||||
# in src/build/android/pylib/gtest/setup.py.
|
||||
'--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
|
||||
'--config-variable', 'OS=<(OS)',
|
||||
# TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run
|
||||
# once support for user-defined config variables is added.
|
||||
'--config-variable',
|
||||
'internal_gles2_conform_tests=<(internal_gles2_conform_tests)',
|
||||
'--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)',
|
||||
'--result', '<@(_outputs)',
|
||||
'--isolate', '<(RULE_INPUT_PATH)',
|
||||
],
|
||||
|
|
Загрузка…
Ссылка в новой задаче