Don't use sys.exit() in build_utils.CheckCallDie().

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 sys
@@ skipping 41 matching lines @@
       '-Xlint:deprecation',
       ] + java_files
 
   def Compile():
     # Delete the 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(output_dir)
     build_utils.MakeDirectory(output_dir)
-    suppress_output = not options.chromium_code
-    build_utils.CheckCallDie(javac_cmd, suppress_output=suppress_output)
+    build_utils.CheckOutput(javac_cmd, print_stdout=options.chromium_code)
 
   record_path = '%s/javac.md5.stamp' % options.output_dir
   md5_check.CallAndRecordIfStale(
       Compile,
       record_path=record_path,
       input_paths=java_files + jar_inputs,
       input_strings=javac_cmd)
 
 
 def main(argv):
@@ skipping 17 matching lines @@
   DoJavac(options)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))