Source release v2.1.2-0-773 + third_party libs

Change-Id: Ia07608577b65b301c22a8ff4bf7f743c2d3f9274

build.py

@@ -11,19 +11,20 @@ import gyp
 
 cdm_top = os.path.abspath(os.path.dirname(__file__))
 
-parser = argparse.ArgumentParser()
-parser.add_argument('platform',
-                    help='The platform configuration to use (x86-64, ...). '
-                    'Should be one of the folder names inside platforms/')
-parser.add_argument('-r', '--release',
-                    dest='build_config', default='Debug',
-                    action='store_const', const='Release',
-                    help='Builds a release build (equivalent to -c Release)')
-parser.add_argument('-c', '--config',
-                    dest='build_config', default='Debug',
-                    help='Select a build config (Debug, Release)')
-parser.add_argument('-g', '--generator', default='make',
-                    help='Which build system to use (make, ninja, ...)')
+
+def IsNinjaInstalled():
+  """Determine if ninja is installed."""
+  try:
+    bit_bucket = open(os.devnull, 'w')
+    subprocess.check_call(['ninja', '--version'], stdout=bit_bucket,
+                          stderr=bit_bucket)
+    return True
+  except subprocess.CalledProcessError:
+    # Error code returned, probably not the ninja we're looking for.
+    return False
+  except OSError:
+    # No such command found.
+    return False
 
 
 def VerboseSubprocess(args):
@@ -93,12 +94,33 @@ def ImportPlatform(name, gyp_args):
 
 
 def main(args):
+  if IsNinjaInstalled():
+    default_generator = 'ninja'
+  else:
+    default_generator = 'make'
+
+  parser = argparse.ArgumentParser()
+  parser.add_argument('platform',
+                      help='The platform configuration to use (x86-64, ...). '
+                      'Should be one of the folder names inside platforms/')
+  parser.add_argument('-r', '--release',
+                      dest='build_config', default='Debug',
+                      action='store_const', const='Release',
+                      help='Builds a release build (equivalent to -c Release)')
+  parser.add_argument('-c', '--config',
+                      dest='build_config', default='Debug',
+                      help='Select a build config (Debug, Release). '
+                      'Defaults to Debug.')
+  parser.add_argument('-g', '--generator', default=default_generator,
+                      help='Which build system to use (make, ninja, ...). '
+                      'Defaults to ninja when available, make otherwise.')
+
   options = parser.parse_args(args)
 
   gyp_args = [
       '--format=%s' % options.generator,
       '--depth=%s' % cdm_top,
-      '%s/cdm/cdm_api_external.gyp' % cdm_top,
+      '%s/cdm/cdm_unittests.gyp' % cdm_top,
   ]
 
   output_path = ImportPlatform(options.platform, gyp_args)
@@ -116,4 +138,4 @@ def main(args):
 
 
 if __name__ == '__main__':
-  main(sys.argv[1:])
+  sys.exit(main(sys.argv[1:]))