Use gn_helpers to [se]serialize GN lists.

build/android/gyp/util/build_utils.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import ast
 import contextlib
 import fnmatch
 import json
 import os
 import pipes
 import re
 import shlex
 import shutil
 import subprocess
 import sys
 import tempfile
 import zipfile
 
 # Some clients do not add //build/android/gyp to PYTHONPATH.
 import md5_check  # pylint: disable=relative-import
 
 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
 from pylib.constants import host_paths
 
+sys.path.append(os.path.join(os.path.dirname(__file__),
+                             os.pardir, os.pardir, os.pardir))
+import gn_helpers
+
 COLORAMA_ROOT = os.path.join(host_paths.DIR_SOURCE_ROOT,
                              'third_party', 'colorama', 'src')
 # aapt should ignore OWNERS files in addition the default ignore pattern.
 AAPT_IGNORE_PATTERN = ('!OWNERS:!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:' +
                        '!CVS:!thumbs.db:!picasa.ini:!*~:!*.d.stamp')
 _HERMETIC_TIMESTAMP = (2001, 1, 1, 0, 0, 0)
 _HERMETIC_FILE_ATTR = (0644 << 16L)
 
 
 @contextlib.contextmanager
@@ skipping 35 matching lines @@
 
 
 def FindInDirectories(directories, filename_filter):
   all_files = []
   for directory in directories:
     all_files.extend(FindInDirectory(directory, filename_filter))
   return all_files
 
 
 def ParseGnList(gn_string):
-  # TODO(brettw) bug 573132: This doesn't handle GN escaping properly, so any
-  # weird characters like $ or \ in the strings will be corrupted.
-  #
-  # The code should import build/gn_helpers.py and then do:
-  #   parser = gn_helpers.GNValueParser(gn_string)
-  #   return return parser.ParseList()
-  # As of this writing, though, there is a CastShell build script that sends
-  # JSON through this function, and using correct GN parsing corrupts that.
-  #
-  # We need to be consistent about passing either JSON or GN lists through
-  # this function.
-  return ast.literal_eval(gn_string)
+  parser = gn_helpers.GNValueParser(gn_string)
+  return parser.ParseList()
 
 
 def ParseGypList(gyp_string):
   # The ninja generator doesn't support $ in strings, so use ## to
   # represent $.
   # TODO(cjhopman): Remove when
   # https://code.google.com/p/gyp/issues/detail?id=327
   # is addressed.
   gyp_string = gyp_string.replace('##', '$')
 
@@ skipping 385 matching lines @@
 
   md5_check.CallAndRecordIfStale(
       on_stale_md5,
       record_path=record_path,
       input_paths=input_paths,
       input_strings=input_strings,
       output_paths=output_paths,
       force=force,
       pass_changes=True)