mac: Use ninja by default.

chrome/installer/mac/dirdiffer.sh

 #!/bin/bash -p
 
 # Copyright (c) 2011 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.
 
 # usage: dirdiffer.sh old_dir new_dir patch_dir
 #
 # dirdiffer creates a patch directory patch_dir that represents the difference
 # between old_dir and new_dir. patch_dir can be used with dirpatcher to
@@ skipping 88 matching lines @@
 # unset, only unexported.
 export PATH="/usr/bin:/bin:/usr/sbin:/sbin"
 unset BASH_ENV CDPATH ENV GLOBIGNORE IFS POSIXLY_CORRECT
 export -n SHELLOPTS
 
 shopt -s dotglob nullglob
 
 # find_tool looks for an executable file named |tool_name|:
 #  - in the same directory as this script,
 #  - if this script is located in a Chromium source tree, at the expected
-#    Release output location in the Mac xcodebuild directory,
+#    Release output location in the Mac out directory,
 #  - as above, but in the Debug output location
 # If found in any of the above locations, the script's path is output.
 # Otherwise, this function outputs |tool_name| as a fallback, allowing it to
 # be found (or not) by an ordinary ${PATH} search.
 find_tool() {
   local tool_name="${1}"
 
   local script_dir
   script_dir="$(dirname "${0}")"
 
   local tool="${script_dir}/${tool_name}"
   if [[ -f "${tool}" ]] && [[ -x "${tool}" ]]; then
     echo "${tool}"
     return
   fi
 
   local script_dir_phys
   script_dir_phys="$(cd "${script_dir}" && pwd -P)"
   if [[ "${script_dir_phys}" =~ ^(.*)/src/chrome/installer/mac$ ]]; then
-    tool="${BASH_REMATCH[1]}/src/xcodebuild/Release/${tool_name}"
+    tool="${BASH_REMATCH[1]}/src/out/Release/${tool_name}"

[Mark Mentovai, 2013/10/25 12:58:19]

You can make this check the ninja locations, and if it’s not found there, then
the xcode locations.

[Nico, 2013/10/25 14:14:45]

I had this at first (see diff from patch set 1 to 2 to see how I incompletely
reverted that change), but then I realized that this is changing in the same CL
as the generator default – so if this CL is reverted, both the generator change
and this file get reverted in the same revision. So I think just using the
canonical location here should be enough.

     if [[ -f "${tool}" ]] && [[ -x "${tool}" ]]; then
       echo "${tool}"
       return
     fi
 
-    tool="${BASH_REMATCH[1]}/src/xcodebuild/Debug/${tool_name}"
+    tool="${BASH_REMATCH[1]}/src/out/Debug/${tool_name}"
     if [[ -f "${tool}" ]] && [[ -x "${tool}" ]]; then
       echo "${tool}"
       return
     fi
   fi
 
   echo "${tool_name}"
 }
 
 ME="$(basename "${0}")"
@@ skipping 390 matching lines @@
   trap - EXIT
 }
 
 if [[ ${#} -ne 3 ]]; then
   usage
   exit 2
 fi
 
 main "${@}"
 exit ${?}