summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xboot-image-measurement.sh4
-rwxr-xr-xtest-art-target-test.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/boot-image-measurement.sh b/boot-image-measurement.sh
index 8798082..23d8d6b 100755
--- a/boot-image-measurement.sh
+++ b/boot-image-measurement.sh
@@ -19,7 +19,7 @@ lunch aosp_x86_64-eng
out_dir=generic_x86_64
fi
-make -j${jcpu_count} dex2oatd dex2oat
+make USE_NINJA=false -j${jcpu_count} dex2oatd dex2oat
for mode in Quick Optimizing
do
sed -i "s/\$(COMPILED_CLASSES_FLAGS)/\$(COMPILED_CLASSES_FLAGS) --compiler-backend=${mode}/g" build/core/dex_preopt_libart_boot.mk
@@ -46,7 +46,7 @@ libdir="x86"
fi
oat_time=0
rm -rf out/target/product/${out_dir}/system/framework/${libdir}/boot.art rm -rf out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/
-make -j${jcpu_count} ${flags} out/target/product/${out_dir}/system/framework/${libdir}/boot.art 2>&1 | tee logs.txt
+make USE_NINJA=false -j${jcpu_count} ${flags} out/target/product/${out_dir}/system/framework/${libdir}/boot.art 2>&1 | tee logs.txt
avg_oatd_time=`grep -rni "dex2oat took" logs.txt | sed -e "s/.*took //g" | sed -e "s/s.*$//g"`
cat logs.txt | grep "dex2oatd --runtime-arg" > cmd.txt
sed -i "s/.*out\/host\/linux-x86\/bin\/dex2oatd/out\/host\/linux-x86\/bin\/dex2oat -j1/g" cmd.txt
diff --git a/test-art-target-test.sh b/test-art-target-test.sh
index 076fc71..83533b8 100755
--- a/test-art-target-test.sh
+++ b/test-art-target-test.sh
@@ -28,7 +28,7 @@ export ART_TEST_RUN_TEST_DEBUG=false
export ART_TEST_RUN_TEST_NDEBUG=true
export ART_USE_OPTIMIZING_COMPILER=true
failed=0
-make USE_NINJA=false -j4 $MAKE_TARGETS > $WORKSPACE/build-logs-64.txt 2>&1
+make USE_NINJA=false -j2 $MAKE_TARGETS > $WORKSPACE/build-logs-64.txt 2>&1
if [ $? -ne 0 ]; then
echo "Error: *** Error make failed"
@@ -63,7 +63,7 @@ export ART_TEST_RUN_TEST_DEBUG=false
export ART_TEST_RUN_TEST_NDEBUG=true
export ART_USE_OPTIMIZING_COMPILER=true
-make USE_NINJA=false -j4 $MAKE_TARGETS > $WORKSPACE/build-logs-32.txt 2>&1
+make USE_NINJA=false -j2 $MAKE_TARGETS > $WORKSPACE/build-logs-32.txt 2>&1
if [ $? -ne 0 ]; then
echo "Error: *** Error make failed"