From 9f497ecf5a152a9996e604c3e649abc91e2007c8 Mon Sep 17 00:00:00 2001 From: Vishal Bhoj Date: Thu, 3 Dec 2015 09:51:27 +0530 Subject: enable NINJA build system Signed-off-by: Vishal Bhoj --- build.sh | 2 +- test-art-target-test.sh | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.sh b/build.sh index c34ad42..9b0c548 100755 --- a/build.sh +++ b/build.sh @@ -4,7 +4,7 @@ MAKE_START=$(date +%s.%N) source build/envsetup.sh lunch $LUNCH_TARGET -make USE_NINJA=false -j${jcpu_count} $MAKE_TARGETS > $WORKSPACE/build-logs.txt 2>&1 +make -j${jcpu_count} $MAKE_TARGETS > $WORKSPACE/build-logs.txt 2>&1 if [ $? -ne 0 ]; then echo "Error: *** Error make failed" diff --git a/test-art-target-test.sh b/test-art-target-test.sh index 8b14926..79e2992 100755 --- a/test-art-target-test.sh +++ b/test-art-target-test.sh @@ -40,11 +40,11 @@ export ART_TEST_RUN_TEST_NDEBUG=true export ART_USE_OPTIMIZING_COMPILER=true failed=0 -make USE_NINJA=false -j12 test-art-target-sync +make -j12 test-art-target-sync export ART_TEST_NO_SYNC=true -make USE_NINJA=false -j2 test-art-target-gtest64 > $WORKSPACE/build-logs-64.txt 2>&1 +make -j2 test-art-target-gtest64 > $WORKSPACE/build-logs-64.txt 2>&1 if [ $? -ne 0 ]; then echo "Error: *** Error test-art-target-gtest64 failed" @@ -52,7 +52,7 @@ if [ $? -ne 0 ]; then failed=1 fi -make USE_NINJA=false -j2 test-art-target-run-test-default >> $WORKSPACE/build-logs-64.txt 2>&1 +make -j2 test-art-target-run-test-default >> $WORKSPACE/build-logs-64.txt 2>&1 if [ $? -ne 0 ]; then echo "Error: *** Error test-art-target-run-test-default failed" @@ -60,7 +60,7 @@ if [ $? -ne 0 ]; then failed=1 fi -make USE_NINJA=false -j2 test-art-target-run-test-interpreter >> $WORKSPACE/build-logs-64.txt 2>&1 +make -j2 test-art-target-run-test-interpreter >> $WORKSPACE/build-logs-64.txt 2>&1 if [ $? -ne 0 ]; then echo "Error: *** Error test-art-target-run-test-interpreter failed" @@ -70,7 +70,7 @@ fi export ART_TEST_RUN_TEST_DEBUGGABLE=true -make USE_NINJA=false -j2 test-art-target-run-test-optimizing >> $WORKSPACE/build-logs-64.txt 2>&1 +make -j2 test-art-target-run-test-optimizing >> $WORKSPACE/build-logs-64.txt 2>&1 if [ $? -ne 0 ]; then echo "Error: *** Error test-art-target-run-test-optimizing failed" @@ -114,11 +114,11 @@ export ART_USE_OPTIMIZING_COMPILER=true export ART_TEST_NO_SYNC=false -make USE_NINJA=false -j12 test-art-target-sync +make -j12 test-art-target-sync export ART_TEST_NO_SYNC=true -make USE_NINJA=false -j2 test-art-target-gtest32 > $WORKSPACE/build-logs-32.txt 2>&1 +make -j2 test-art-target-gtest32 > $WORKSPACE/build-logs-32.txt 2>&1 if [ $? -ne 0 ]; then echo "Error: *** Error test-art-target-gtest64 failed" @@ -126,7 +126,7 @@ if [ $? -ne 0 ]; then failed=1 fi -make USE_NINJA=false -j2 test-art-target-run-test-default >> $WORKSPACE/build-logs-32.txt 2>&1 +make -j2 test-art-target-run-test-default >> $WORKSPACE/build-logs-32.txt 2>&1 if [ $? -ne 0 ]; then echo "Error: *** Error test-art-target-run-test-default failed" @@ -134,7 +134,7 @@ if [ $? -ne 0 ]; then failed=1 fi -make USE_NINJA=false -j2 test-art-target-run-test-interpreter >> $WORKSPACE/build-logs-32.txt 2>&1 +make -j2 test-art-target-run-test-interpreter >> $WORKSPACE/build-logs-32.txt 2>&1 if [ $? -ne 0 ]; then echo "Error: *** Error test-art-target-run-test-interpreter failed" @@ -144,7 +144,7 @@ fi export ART_TEST_RUN_TEST_DEBUGGABLE=true -make USE_NINJA=false -j2 test-art-target-run-test-optimizing >> $WORKSPACE/build-logs-32.txt 2>&1 +make -j2 test-art-target-run-test-optimizing >> $WORKSPACE/build-logs-32.txt 2>&1 if [ $? -ne 0 ]; then echo "Error: *** Error test-art-target-run-test-optimizing failed" -- cgit v1.2.3