Source release 15.0.0

build.py

@@ -38,7 +38,7 @@ def VerboseSubprocess(args):
   return subprocess.call(args)
 
 
-def RunMake(unused_output_path, build_config, job_limit):
+def RunMake(unused_output_path, build_config, job_limit, verbose):
   os.environ['BUILDTYPE'] = build_config
 
   if job_limit is not None:
@@ -49,10 +49,13 @@ def RunMake(unused_output_path, build_config, job_limit):
   else:
     job_args = []
 
+  if verbose:
+    job_args += ['-v']
+  job_args += ['all', 'widevine_ce_cdm_shared']
   return VerboseSubprocess(['make', '-C', cdm_top] + job_args)
 
 
-def RunNinja(output_path, build_config, job_limit):
+def RunNinja(output_path, build_config, job_limit, verbose):
   build_path = os.path.join(output_path, build_config)
 
   if job_limit is not None:
@@ -64,10 +67,13 @@ def RunNinja(output_path, build_config, job_limit):
   else:
     job_args = []
 
+  if verbose:
+    job_args += ['-v']
+  job_args += ['all', 'widevine_ce_cdm_shared']
   return VerboseSubprocess(['ninja', '-C', build_path] + job_args)
 
 
-def RunUnknown(unused_output_path, unused_build_config, unused_job_limit):
+def RunUnknown(*unused_args):
   print 'Cannot automatically build with this generator.'
   print 'Please start the build manually.'
   return 0
@@ -158,6 +164,8 @@ def main(args):
   parser.add_argument('--shaka_adapter', default=False,
                       action='store_true',
                       help='Also build the Shaka Embedded adapter.')
+  parser.add_argument('-v', '--verbose', action='store_true',
+                      help='Print verbose output.')
 
   options = parser.parse_args(args)
 
@@ -187,7 +195,7 @@ def main(args):
   # ignores the generator flag output_dir (as of 2014-05-28 with ninja).
   # So instead of using --build, we simply invoke the build system ourselves.
   builder = GetBuilder(options.generator)
-  return builder(output_path, options.build_config, options.jobs)
+  return builder(output_path, options.build_config, options.jobs, options.verbose)
 
 
 if __name__ == '__main__':