Change in android Java build rules for Mojo Java content handler

build/android/gyp/javac.py

 #!/usr/bin/env python
 #
 # 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 fnmatch
 import optparse
 import os
 import shutil
@@ skipping 88 matching lines @@
   md5_check.CallAndRecordIfStale(
       Compile,
       record_path=record_path,
       input_paths=java_files + jar_inputs,
       input_strings=javac_cmd)
 
 
 _MAX_MANIFEST_LINE_LEN = 72
 
 
-def CreateManifest(manifest_path, classpath, main_class=None):
+def CreateManifest(manifest_path, classpath, main_class=None,
+                   manifest_entries=None):
   """Creates a manifest file with the given parameters.
 
   This generates a manifest file that compiles with the spec found at
   http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Manifest
 
   Args:
     manifest_path: The path to the manifest file that should be created.
     classpath: The JAR files that should be listed on the manifest file's
       classpath.
     main_class: If present, the class containing the main() function.
+    manifest_entries: If present, a list of (key, value) pairs to add to
+      the manifest.
 
   """
   output = ['Manifest-Version: 1.0']
   if main_class:
     output.append('Main-Class: %s' % main_class)
+  if manifest_entries:
+    for k, v in manifest_entries:
+      output.append('%s: %s' % (k, v))
   if classpath:
     sanitized_paths = []
     for path in classpath:
       sanitized_paths.append(os.path.basename(path.strip('"')))
     output.append('Class-Path: %s' % ' '.join(sanitized_paths))
   output.append('Created-By: ')
   output.append('')
 
   wrapper = textwrap.TextWrapper(break_long_words=True,
                                  drop_whitespace=False,
@@ skipping 41 matching lines @@
       help='Whether code being compiled should be built with stricter '
       'warnings for chromium code.')
 
   parser.add_option(
       '--classes-dir',
       help='Directory for compiled .class files.')
   parser.add_option('--jar-path', help='Jar output path.')
   parser.add_option(
       '--main-class',
       help='The class containing the main method.')
+  parser.add_option(
+      '--manifest-entry',
+      action='append',
+      help='Key:value pairs to add to the .jar manifest.')
 
   parser.add_option('--stamp', help='Path to touch on success.')
 
   options, args = parser.parse_args(argv)
 
   if options.main_class and not options.jar_path:
     parser.error('--main-class requires --jar-path')
 
   classpath = []
   for arg in options.classpath:
@@ skipping 29 matching lines @@
             break
       java_files = filtered_java_files
 
     DoJavac(
         classpath,
         classes_dir,
         options.chromium_code,
         java_files)
 
     if options.jar_path:
-      if options.main_class:
+      if options.main_class or options.manifest_entry:
+        if options.manifest_entry:
+          entries = map(lambda e: e.split(":"), options.manifest_entry)
+        else:
+          entries = []
         manifest_file = os.path.join(temp_dir, 'manifest')
-        CreateManifest(manifest_file, classpath,
-                       options.main_class)
+        CreateManifest(manifest_file, classpath, options.main_class, entries)
       else:
         manifest_file = None
       jar.JarDirectory(classes_dir,
                        build_utils.ParseGypList(options.jar_excluded_classes),
                        options.jar_path,
                        manifest_file=manifest_file)
 
     if options.classes_dir:
       # Delete the old classes directory. This ensures that all .class files in
       # the output are actually from the input .java files. For example, if a
       # .java file is deleted or an inner class is removed, the classes
       # directory should not contain the corresponding old .class file after
       # running this action.
       build_utils.DeleteDirectory(options.classes_dir)
       shutil.copytree(classes_dir, options.classes_dir)
 
   if options.depfile:
     build_utils.WriteDepfile(
         options.depfile,
         input_files + build_utils.GetPythonDependencies())
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))