[felt] Use autoninja instead of hardcoding threads (#21130)

autoninja is included as part of depot_tools and automatically
determines the optimal thread count.

Also applies quoting on the affected lines.
This commit is contained in:
Chris Bracken 2020-09-12 12:14:05 -07:00 committed by GitHub
parent ca731e6ac3
commit 1fa99cd618
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -16,13 +16,13 @@ then
fi
GCLIENT_PATH=`which gclient`
if [ -z "`which ninja`" ]
if [ -z "`which autoninja`" ]
then
echo "ERROR: ninja is not in your PATH"
echo "ERROR: autoninja is not in your PATH"
echo "Fix: add the path to your installation of depot_tools to your PATH"
exit 1
fi
NINJA_PATH=`which ninja`
NINJA_PATH=`which autoninja`
ENGINE_SRC_DIR="$(dirname $(dirname $(dirname $(dirname ${FELT_DIR}))))"
FLUTTER_DIR="${ENGINE_SRC_DIR}/flutter"
@ -45,7 +45,7 @@ then
echo "Compiling the Dart SDK."
gclient sync
$GN --unoptimized --full-dart-sdk
ninja -C $HOST_DEBUG_UNOPT_DIR -j 100
"$NINJA_PATH" -C "$HOST_DEBUG_UNOPT_DIR"
fi
install_deps() {