Use "debug" for image location
The com.android.art directory seems to no longer exist, use the
com.android.art.debug directory instead since this matches
with the boot class path.
Also changed dex2oat to be the debug version to enable compiler
stats working by default.
Test: tools/compile-jar.sh on an APK
Change-Id: I0eb9dbf08b0f57c832340be79aa93ac0144d72d0
diff --git a/tools/compile-jar.sh b/tools/compile-jar.sh
index 5024ccc..aae2415 100755
--- a/tools/compile-jar.sh
+++ b/tools/compile-jar.sh
@@ -15,7 +15,7 @@
# limitations under the License.
#
-# This script creates a boot image profile based on input profiles.
+# This script runs dex2oat on the host to compile a provided JAR or APK.
#
if [[ "$#" -lt 1 ]]; then
@@ -31,9 +31,10 @@
ISA=$1
shift
-dex2oat \
+# Use services.odex as a quick and dirty way to get correct BCP.
+dex2oatd \
--runtime-arg -Xms64m --runtime-arg -Xmx512m \
- --boot-image=${OUT}/apex/com.android.art/javalib/boot.art:${OUT}/system/framework/boot-framework.art \
+ --boot-image=${OUT}/apex/com.android.art.debug/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} \