commit 9e9aca92369d2cc75aff3577daadc1c901b5303d
author Vitaly Buka <vitalybuka@google.com> Mon Nov 23 23:20:12 2015 -0800
committer Vitaly Buka <vitalybuka@google.com> Tue Nov 24 22:39:50 2015 +0000
tree 8ab8970808646a3effaa24a1c6c0ee1ac97c9998
parent 6f7385f802f8b4b41232e3a1c6c0dd70543ef464

Remove dependency on ninja-build

Change-Id: Ib13212ec6a2cebbdda8ab1220b71fdaa39c91927
Reviewed-on: https://weave-review.googlesource.com/1631
Reviewed-by: Vitaly Buka <vitalybuka@google.com>
Reviewed-by: Alex Vakulenko <avakulenko@google.com>

examples/build.sh

diff --git a/examples/build.sh b/examples/build.sh
index e4c412d..262c56b 100755
--- a/examples/build.sh
+++ b/examples/build.sh
@@ -8,7 +8,7 @@
 
 cd $ROOT_DIR
 
-gyp -Ilibweave_common.gypi --toplevel-dir=. --depth=. -f ninja $DIR/daemon/examples.gyp
+gyp -Ilibweave_common.gypi --toplevel-dir=. --depth=. -f make $DIR/daemon/examples.gyp
 
 if [ -z "$BUILD_CONFIG" ]; then
    export BUILD_CONFIG=Debug
@@ -20,7 +20,7 @@
 fi
 
 export CORES=`cat /proc/cpuinfo | grep processor | wc -l`
-ninja -j $CORES -C out/${BUILD_CONFIG} $BUILD_TARGET || exit 1
+BUILDTYPE=$BUILD_CONFIG make -j $CORES $BUILD_TARGET || exit 1
 
 if [[ $BUILD_TARGET == *"libweave_testrunner"* ]]; then
   out/${BUILD_CONFIG}/libweave_testrunner --gtest_break_on_failure || exit 1