Fix the Android Eclipse CDT generator.

pylib/gyp/generator/eclipse.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """GYP backend that generates Eclipse CDT settings files.
 
 This backend DOES NOT generate Eclipse CDT projects. Instead, it generates XML
 files that can be imported into an Eclipse CDT project. The XML file contains a
 list of include paths and symbols (i.e. defines).
 
 Because a full .cproject definition is not created by this generator, it's not
 possible to properly define the include dirs and symbols for each file
 individually.  Instead, one set of includes/symbols is generated for the entire
 project.  This works fairly well (and is a vast improvement in general), but may
 still result in a few indexer issues here and there.
 
 This generator has no automated tests, so expect it to be broken.
 """
 
+from xml.sax.saxutils import escape
 import os.path
 import subprocess
 import gyp
 import gyp.common
 import shlex
 
 generator_wants_static_library_dependencies_adjusted = False
 
 generator_default_variables = {
 }
 
 for dirname in ['INTERMEDIATE_DIR', 'PRODUCT_DIR', 'LIB_DIR', 'SHARED_LIB_DIR']:
   # Some gyp steps fail if these are empty(!).
   generator_default_variables[dirname] = 'dir'
 
 for unused in ['RULE_INPUT_PATH', 'RULE_INPUT_ROOT', 'RULE_INPUT_NAME',
                'RULE_INPUT_DIRNAME', 'RULE_INPUT_EXT',
                'EXECUTABLE_PREFIX', 'EXECUTABLE_SUFFIX',
                'STATIC_LIB_PREFIX', 'STATIC_LIB_SUFFIX',
-               'SHARED_LIB_PREFIX', 'SHARED_LIB_SUFFIX']:
+               'SHARED_LIB_PREFIX', 'SHARED_LIB_SUFFIX',
+               'CONFIGURATION_NAME']:
   generator_default_variables[unused] = ''
 
 # Include dirs will occasionaly use the SHARED_INTERMEDIATE_DIR variable as
 # part of the path when dealing with generated headers.  This value will be
 # replaced dynamically for each configuration.
 generator_default_variables['SHARED_INTERMEDIATE_DIR'] = \
     '$SHARED_INTERMEDIATES_DIR'
 
 
 def CalculateVariables(default_variables, params):
@@ skipping 159 matching lines @@
 def WriteMacros(out, eclipse_langs, defines):
   """Write the macros section of a CDT settings export file."""
 
   out.write('  <section name="org.eclipse.cdt.internal.ui.wizards.' \
             'settingswizards.Macros">\n')
   out.write('    <language name="holder for library settings"></language>\n')
   for lang in eclipse_langs:
     out.write('    <language name="%s">\n' % lang)
     for key in sorted(defines.iterkeys()):
       out.write('      <macro><name>%s</name><value>%s</value></macro>\n' %
-                (key, defines[key]))
+                (escape(key), escape(defines[key])))
     out.write('    </language>\n')
   out.write('  </section>\n')
 
 
 def GenerateOutputForConfig(target_list, target_dicts, data, params,
                             config_name):
   options = params['options']
   generator_flags = params.get('generator_flags', {})
 
   # build_dir: relative path from source root to our output files.
@@ skipping 32 matching lines @@
   user_config = params.get('generator_flags', {}).get('config', None)
   if user_config:
     GenerateOutputForConfig(target_list, target_dicts, data, params,
                             user_config)
   else:
     config_names = target_dicts[target_list[0]]['configurations'].keys()
     for config_name in config_names:
       GenerateOutputForConfig(target_list, target_dicts, data, params,
                               config_name)