Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
2a20f42558
@@ -787,6 +787,12 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
|
||||
addOption("-Ximage-compiler-option");
|
||||
addOption("--image-classes=/system/etc/preloaded-classes");
|
||||
|
||||
// If there is a compiled-classes file, push it.
|
||||
if (hasFile("/system/etc/compiled-classes")) {
|
||||
addOption("-Ximage-compiler-option");
|
||||
addOption("--compiled-classes=/system/etc/compiled-classes");
|
||||
}
|
||||
|
||||
property_get("dalvik.vm.image-dex2oat-flags", dex2oatImageFlagsBuf, "");
|
||||
parseExtraOpts(dex2oatImageFlagsBuf, "-Ximage-compiler-option");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user