diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-12-10 16:18:41 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-12-10 16:24:44 +0530 |
| commit | 6e28e55c2d998cf2158de7a810c1a8fb36dad66f (patch) | |
| tree | 61f1c32975eae8b85ee10106c79e9030b0c14d17 | |
| parent | b5e8fadcd00ff8843f483b9a77e88270ca775a67 (diff) | |
enable ninja for acov and bootimagemeasurement
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
| -rwxr-xr-x | acov.sh | 4 | ||||
| -rwxr-xr-x | boot-image-measurement.sh | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -46,7 +46,7 @@ lunch aosp_x86_64-eng out_dir=generic_x86_64 fi -make USE_NINJA=false ${flags} -j${jcpu_count} dex2oatd dex2oat +make ${flags} -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 @@ -71,7 +71,7 @@ libdir="x86_64" else libdir="x86" fi -make USE_NINJA=false -j${jcpu_count} ${flags} out/target/product/${out_dir}/system/framework/${libdir}/boot.art > logs.txt 2>&1 +make -j${jcpu_count} ${flags} out/target/product/${out_dir}/system/framework/${libdir}/boot.art > logs.txt 2>&1 cat logs.txt cat logs.txt | grep "dex2oatd --runtime-arg" > cmd.txt sed -i "s/.*out\/host\/linux-x86\/bin\/dex2oatd/out\/host\/linux-x86\/bin\/dex2oat/g" cmd.txt diff --git a/boot-image-measurement.sh b/boot-image-measurement.sh index 2cb78f0..d17199f 100755 --- a/boot-image-measurement.sh +++ b/boot-image-measurement.sh @@ -18,7 +18,7 @@ lunch aosp_x86_64-eng out_dir=generic_x86_64 fi -make USE_NINJA=false -j${jcpu_count} dex2oatd dex2oat +make -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 @@ -45,7 +45,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 USE_NINJA=false -j${jcpu_count} ${flags} out/target/product/${out_dir}/system/framework/${libdir}/boot.art 2>&1 | tee logs.txt +make -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 |