📱 Simplify naming of generated java enums IntDefs

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 311 matching lines @@
 // From
 //     ${SOURCE_PATH}
 
 package ${PACKAGE};
 
 import android.support.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-public class ${CLASS_NAME} {
-  @IntDef({
+@IntDef({
 ${INT_DEF}
-  })
-  @Retention(RetentionPolicy.SOURCE)
-  public @interface ${ANNOTATION} {}
+})
+@Retention(RetentionPolicy.SOURCE)
+public @interface ${CLASS_NAME} {
 ${ENUM_ENTRIES}
 }
 """)
 
-  enum_template = Template('  public static final int ${NAME} = ${VALUE};')
+  enum_template = Template('  int ${NAME} = ${VALUE};')
   enum_entries_string = []
   enum_names = []
   for enum_name, enum_value in enum_definition.entries.iteritems():
     values = {
         'NAME': enum_name,
         'VALUE': enum_value,
     }
     enum_comments = enum_definition.comments.get(enum_name)
     if enum_comments:
         enum_comments_indent = '   * '
         comments_line_wrapper = textwrap.TextWrapper(
                 initial_indent=enum_comments_indent,
                 subsequent_indent=enum_comments_indent,
                 width=100)
         enum_entries_string.append('  /**')
         enum_entries_string.append(
                 '\n'.join(comments_line_wrapper.wrap(enum_comments)))
         enum_entries_string.append('   */')
     enum_entries_string.append(enum_template.substitute(values))
-    enum_names.append(enum_name)
+    enum_names.append(enum_definition.class_name + '.' + enum_name)
   enum_entries_string = '\n'.join(enum_entries_string)
 
-  enum_names_indent = ' ' * 6
+  enum_names_indent = ' ' * 4
   wrapper = textwrap.TextWrapper(initial_indent = enum_names_indent,
                                  subsequent_indent = enum_names_indent,
                                  width = 100)
   enum_names_string = '\n'.join(wrapper.wrap(', '.join(enum_names)))
 
-  annotation_template = Template('${NAME}Enum')
-  annotation_values = { 'NAME': enum_definition.class_name, }
-  annotation_name = annotation_template.substitute(annotation_values)
-
   values = {
       'CLASS_NAME': enum_definition.class_name,
       'ENUM_ENTRIES': enum_entries_string,
       'PACKAGE': enum_definition.enum_package,
       'INT_DEF': enum_names_string,
-      'ANNOTATION': annotation_name,
       'SCRIPT_NAME': GetScriptName(),
       'SOURCE_PATH': source_path,
       'YEAR': str(date.today().year)
   }
   return template.substitute(values)
 
 
 def DoMain(argv):
   usage = 'usage: %prog [options] [output_dir] input_file(s)...'
   parser = optparse.OptionParser(usage=usage)
@@ skipping 12 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:])