Add -bootclasspath argument to javac.

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 48 matching lines @@
   # Something in chrome_private_java makes this check crash.
   'com.google.errorprone.bugpatterns.ClassCanBeStatic,'
   # These crash on lots of targets.
   'com.google.errorprone.bugpatterns.WrongParameterPackage,'
   'com.google.errorprone.bugpatterns.GuiceOverridesGuiceInjectableMethod,'
   'com.google.errorprone.bugpatterns.GuiceOverridesJavaxInjectableMethod,'
   'com.google.errorprone.bugpatterns.ElementsCountedInLoop'
 ]
 
 def DoJavac(
-    classpath, classes_dir, chromium_code,
+    bootclasspath, classpath, classes_dir, chromium_code,
     use_errorprone_path, java_files):
   """Runs javac.
 
   Builds |java_files| with the provided |classpath| and puts the generated
   .class files into |classes_dir|. If |chromium_code| is true, extra lint
   checking will be enabled.
   """
 
   jar_inputs = []
   for path in classpath:
     if os.path.exists(path + '.TOC'):
       jar_inputs.append(path + '.TOC')
     else:
       jar_inputs.append(path)
 
   javac_args = [
       '-g',
       # Chromium only allows UTF8 source files.  Being explicit avoids
       # javac pulling a default encoding from the user's environment.
       '-encoding', 'UTF-8',
       '-source', '1.7',
       '-target', '1.7',
       '-classpath', ':'.join(classpath),
       '-d', classes_dir]
+
+  if bootclasspath:
+    javac_args.extend(['-bootclasspath', ':'.join(bootclasspath)])
+
   if chromium_code:
     # TODO(aurimas): re-enable '-Xlint:deprecation' checks once they are fixed.
     javac_args.extend(['-Xlint:unchecked'])
   else:
     # XDignore.symbol.file makes javac compile against rt.jar instead of
     # ct.sym. This means that using a java internal package/class will not
     # trigger a compile warning or error.
     javac_args.extend(['-XDignore.symbol.file'])
 
   if use_errorprone_path:
@@ skipping 70 matching lines @@
 
   parser.add_option(
       '--src-gendirs',
       help='Directories containing generated java files.')
   parser.add_option(
       '--java-srcjars',
       action='append',
       default=[],
       help='List of srcjars to include in compilation.')
   parser.add_option(
+      '--bootclasspath',
+      action='append',
+      default=[],
+      help='Boot classpath for javac. If this is specified multiple times, '
+      'they will all be appended to construct the classpath.')
+  parser.add_option(
       '--classpath',
       action='append',
       help='Classpath for javac. If this is specified multiple times, they '
       'will all be appended to construct the classpath.')
   parser.add_option(
       '--javac-includes',
       help='A list of file patterns. If provided, only java files that match'
       'one of the patterns will be compiled.')
   parser.add_option(
       '--jar-excluded-classes',
@@ skipping 22 matching lines @@
       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')
 
+  bootclasspath = []
+  for arg in options.bootclasspath:
+    bootclasspath += build_utils.ParseGypList(arg)
+
   classpath = []
   for arg in options.classpath:
     classpath += build_utils.ParseGypList(arg)
 
   java_srcjars = []
   for arg in options.java_srcjars:
     java_srcjars += build_utils.ParseGypList(arg)
 
   java_files = args
   if options.src_gendirs:
     src_gendirs = build_utils.ParseGypList(options.src_gendirs)
     java_files += build_utils.FindInDirectories(src_gendirs, '*.java')
 
-  input_files = classpath + java_srcjars + java_files
+  input_files = bootclasspath + classpath + java_srcjars + java_files
   with build_utils.TempDir() as temp_dir:
     classes_dir = os.path.join(temp_dir, 'classes')
     os.makedirs(classes_dir)
     if java_srcjars:
       java_dir = os.path.join(temp_dir, 'java')
       os.makedirs(java_dir)
       for srcjar in java_srcjars:
         build_utils.ExtractAll(srcjar, path=java_dir, pattern='*.java')
       java_files += build_utils.FindInDirectory(java_dir, '*.java')
 
     if options.javac_includes:
       javac_includes = build_utils.ParseGypList(options.javac_includes)
       filtered_java_files = []
       for f in java_files:
         for include in javac_includes:
           if fnmatch.fnmatch(f, include):
             filtered_java_files.append(f)
             break
       java_files = filtered_java_files
 
     if len(java_files) != 0:
       DoJavac(
+          bootclasspath,
           classpath,
           classes_dir,
           options.chromium_code,
           options.use_errorprone_path,
           java_files)
 
     if options.jar_path:
       if options.main_class or options.manifest_entry:
         if options.manifest_entry:
           entries = map(lambda e: e.split(":"), options.manifest_entry)
@@ skipping 23 matching lines @@
         input_files + build_utils.GetPythonDependencies())
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))