am 2a20f425: Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev

* commit '2a20f425580b48ec5c130e77eb2a447731e37381':
  Frameworks/base: Compiled-classes support
This commit is contained in:
Andreas Gampe
2014-11-18 22:52:25 +00:00
committed by Android Git Automerger

View File

@@ -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");