Tracking merge of dalvik-dev to master
Reordered bootclasspath to allow verification of all framework methods.
git cherry-pick --no-commit ec164a0170955fe63106c2576a65bc4ffb1df425
Address CVE-2011-1090.
git cherry-pick --no-commit 3365288d3c00072689cd9d733e055561cadc87b5
Change-Id: I6a89bc600ced06a0cb84ae1670cb7a6ea39de9c8
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 54873e0..a2c6beb 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -19,7 +19,7 @@
export ANDROID_DATA /data
export ASEC_MOUNTPOINT /mnt/asec
export LOOP_MOUNTPOINT /mnt/obb
- export BOOTCLASSPATH /system/framework/core.jar:/system/framework/apache-xml.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/core-junit.jar
+ export BOOTCLASSPATH /system/framework/core.jar:/system/framework/core-junit.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/apache-xml.jar
# Backward compatibility
symlink /system/etc /etc