Fix comment preservation in java_cpp_enum.py.

build/android/gyp/java_cpp_enum.py

 #!/usr/bin/env python
 #
 # Copyright 2014 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 collections
 from datetime import date
 import re
 import optparse
@@ skipping 72 matching lines @@
 
   def _StripPrefix(self):
     prefix_to_strip = self.prefix_to_strip
     if not prefix_to_strip:
       prefix_to_strip = self.original_enum_name
       prefix_to_strip = re.sub('(?!^)([A-Z]+)', r'_\1', prefix_to_strip).upper()
       prefix_to_strip += '_'
       if not all([w.startswith(prefix_to_strip) for w in self.entries.keys()]):
         prefix_to_strip = ''
 
-    entries = collections.OrderedDict()
-    for (k, v) in self.entries.iteritems():
-      stripped_key = k.replace(prefix_to_strip, '', 1)
-      if isinstance(v, basestring):
-        stripped_value = v.replace(prefix_to_strip, '', 1)
-      else:
-        stripped_value = v
-      entries[stripped_key] = stripped_value
+    def StripEntries(entries):
+      ret = collections.OrderedDict()
+      for (k, v) in entries.iteritems():
+        stripped_key = k.replace(prefix_to_strip, '', 1)
+        if isinstance(v, basestring):
+          stripped_value = v.replace(prefix_to_strip, '', 1)
+        else:
+          stripped_value = v
+        ret[stripped_key] = stripped_value
 
-    self.entries = entries
+      return ret
+
+    self.entries = StripEntries(self.entries)
+    self.comments = StripEntries(self.comments)
 
 class DirectiveSet(object):
   class_name_override_key = 'CLASS_NAME_OVERRIDE'
   enum_package_key = 'ENUM_PACKAGE'
   prefix_to_strip_key = 'PREFIX_TO_STRIP'
 
   known_keys = [class_name_override_key, enum_package_key, prefix_to_strip_key]
 
   def __init__(self):
     self._directives = {}
@@ skipping 88 matching lines @@
 
     enum_entry = HeaderParser.enum_line_re.match(self._current_enum_entry)
     if not enum_entry:
       raise Exception('Unexpected error while attempting to parse %s as enum '
                       'entry.' % self._current_enum_entry)
 
     enum_key = enum_entry.groups()[0]
     enum_value = enum_entry.groups()[2]
     self._current_definition.AppendEntry(enum_key, enum_value)
     if self._current_comments:
-       self._current_definition.AppendEntryComment(
-               enum_key, ' '.join(self._current_comments))
-       self._current_comments = []
+      self._current_definition.AppendEntryComment(
+          enum_key, ' '.join(self._current_comments))
+      self._current_comments = []
     self._current_enum_entry = ''
 
   def _AddToCurrentEnumEntry(self, line):
     self._current_enum_entry += ' ' + line.strip()
 
   def _FinalizeCurrentEnumEntry(self):
     if self._current_enum_entry:
       self._ParseCurrentEnumEntry()
     self._ApplyGeneratorDirectives()
     self._current_definition.Finalize()
@@ skipping 157 matching lines @@
   with zipfile.ZipFile(options.srcjar, 'w', zipfile.ZIP_STORED) as srcjar:
     for output_path, data in DoGenerate(input_paths):
       build_utils.AddToZipHermetic(srcjar, output_path, data=data)
 
   if options.depfile:
     build_utils.WriteDepfile(options.depfile, options.srcjar)
 
 
 if __name__ == '__main__':
   DoMain(sys.argv[1:])