Include icu.isolate instead of listing icudt.dll

build/android/pylib/gtest/setup.py

Index: build/android/pylib/gtest/setup.py
diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py
index 0896973cd13072e509d310f1a3542dd18bf78099..1d167235dc19d394530db8a9c31efe40aa4b6831 100644
--- a/build/android/pylib/gtest/setup.py
+++ b/build/android/pylib/gtest/setup.py
@@ -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

[M-A Ruel, 2014/01/15 23:21:20]

Python comments are #, not //.

+  // 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',

[jungshik at Google, 2014/01/15 23:13:10]

Using 0 (bare) led to a crash (argv has to be a string). Changing it to '0'
(qted). 

 File "/b/build/slave/android/build/src/build/android/pylib/cmd_helper.py", line
43, in RunCmd
    return Call(args, cwd=cwd)
  File "/b/build/slave/android/build/src/build/android/pylib/cmd_helper.py",
line 25, in Call
    env=env)
  File "/b/build/slave/android/build/src/build/android/pylib/cmd_helper.py",
line 20, in Popen
    preexec_fn=lambda: signal.signal(signal.SIGPIPE, signal.SIG_DFL))
  File "/usr/lib/python2.7/subprocess.py", line 679, in __init__
    errread, errwrite)
  File "/usr/lib/python2.7/subprocess.py", line 1249, in _execute_child
    raise child_exception
TypeError: execv() arg 2 must contain only strings

[M-A Ruel, 2014/01/15 23:21:20]

Yep, since it is on the command line. Note that using 'icu_use_data_file_flag=0'
works too.

       '--outdir', constants.ISOLATE_DEPS_DIR,
   ]
   assert not cmd_helper.RunCmd(isolate_cmd)