Fix compile-jar.sh for new boot image locations
Now the boot image is split into primary part in the ART apex
and the framework boot image extension in /system/framework.
It is no longer possible to get the full boot class path from the
boot image oat files, so we use services.odex instead.
Test: art/tools/compile-jar.sh bench.jar bench.odex arm64
Change-Id: I6e18ec4805bca9c9e5ba4c939a96885a0815696c
diff --git a/tools/compile-jar.sh b/tools/compile-jar.sh
index 2654531..5024ccc 100755
--- a/tools/compile-jar.sh
+++ b/tools/compile-jar.sh
@@ -33,8 +33,8 @@
dex2oat \
--runtime-arg -Xms64m --runtime-arg -Xmx512m \
- --boot-image=${OUT}/system/framework/boot.art \
- `$ANDROID_BUILD_TOP/art/tools/host_bcp.sh $OUT/system/framework/$ISA/boot.oat --use-first-dir` \
+ --boot-image=${OUT}/apex/com.android.art/javalib/boot.art:${OUT}/system/framework/boot-framework.art \
+ $(${ANDROID_BUILD_TOP}/art/tools/host_bcp.sh ${OUT}/system/framework/oat/${ISA}/services.odex --use-first-dir) \
--dex-file=${FILE} --dex-location=/system/framework/${FILE} \
--oat-file=${OUTPUT} \
--android-root=${OUT}/system --instruction-set=$ISA \