[Android] JUnit runner + gyp changes.

build/android/gyp/jar.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 sys
 
 from util import build_utils
 from util import md5_check
 
-def Jar(class_files, classes_dir, jar_path):
+
+def Jar(class_files, classes_dir, jar_path, manifest_file=None):

[cjhopman, 2014/09/15 22:27:36]

I would like to actually get rid of jar.py. javac.py already has an option to
create a .jar of the compiled classes, could we just add the manifest file
handling there? This would make the gyp files simpler, too.

[jbudorick, 2014/09/16 02:50:40]

This has to keep some manifest logic since javac.py calls JarDirectory, but I've
moved things around to use javac. The stuff in main() is gone.

   jar_path = os.path.abspath(jar_path)
 
   # The paths of the files in the jar will be the same as they are passed in to
   # the command. Because of this, the command should be run in
   # options.classes_dir so the .class file paths in the jar are correct.
   jar_cwd = classes_dir
   class_files_rel = [os.path.relpath(f, jar_cwd) for f in class_files]
-  jar_cmd = ['jar', 'cf0', jar_path] + class_files_rel
+  jar_cmd = ['jar', 'cf0', jar_path]
+  if manifest_file:
+    jar_cmd[1] += 'm'
+    jar_cmd.append(os.path.abspath(manifest_file))
+  jar_cmd.extend(class_files_rel)
 
   record_path = '%s.md5.stamp' % jar_path
   md5_check.CallAndRecordIfStale(
       lambda: build_utils.CheckOutput(jar_cmd, cwd=jar_cwd),
       record_path=record_path,
       input_paths=class_files,
       input_strings=jar_cmd,
       force=not os.path.exists(jar_path),
       )
 
   build_utils.Touch(jar_path, fail_if_missing=True)
 
 
-def JarDirectory(classes_dir, excluded_classes, jar_path):
+def JarDirectory(classes_dir, excluded_classes, jar_path, manifest_file=None):
   class_files = build_utils.FindInDirectory(classes_dir, '*.class')
   for exclude in excluded_classes:
     class_files = filter(
         lambda f: not fnmatch.fnmatch(f, exclude), class_files)
 
-  Jar(class_files, classes_dir, jar_path)
+  Jar(class_files, classes_dir, jar_path, manifest_file=manifest_file)
+
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option('--classes-dir', help='Directory containing .class files.')
   parser.add_option('--jar-path', help='Jar output path.')
   parser.add_option('--excluded-classes',
       help='List of .class file patterns to exclude from the jar.')
   parser.add_option('--stamp', help='Path to touch on success.')
+  parser.add_option('--manifest-file', help='The manifest file.')
 
   options, _ = parser.parse_args()
 
+  if options.excluded_classes:
+    excluded_classes = build_utils.ParseGypList(options.excluded_classes)
+  else:
+    excluded_classes = []
   JarDirectory(options.classes_dir,
-               build_utils.ParseGypList(options.excluded_classes),
-               options.jar_path)
+               excluded_classes,
+               options.jar_path,
+               manifest_file=options.manifest_file)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main())