Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add boot profile support"

Browse Source 
am: 3d901ec513

Change-Id: I37db2f4bd7e6412954d51e914f6e238db5027a6e
This commit is contained in:
Mathieu Chartier
2017-07-01 03:32:41 +00:00
committed by android-build-merger
parent 197b62d3fa 3d901ec513
commit 7e73b5165d
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/jni/AndroidRuntime.cpp
View File

@@ -795,19 +795,27 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote)
"--compiler-filter=", "-Ximage-compiler-option");
}
// Make sure there is a preloaded-classes file.
if (!hasFile("/system/etc/preloaded-classes")) {
ALOGE("Missing preloaded-classes file, /system/etc/preloaded-classes not found: %s\n",
strerror(errno));
return -1;
}
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")) {
// If there is a boot profile, it takes precedence over the image and preloaded classes.
if (hasFile("/system/etc/boot-image.prof")) {
addOption("-Ximage-compiler-option");
addOption("--compiled-classes=/system/etc/compiled-classes");
addOption("--profile-file=/system/etc/boot-image.prof");
addOption("-Ximage-compiler-option");
addOption("--compiler-filter=speed-profile");
} else {
// Make sure there is a preloaded-classes file.
if (!hasFile("/system/etc/preloaded-classes")) {
ALOGE("Missing preloaded-classes file, /system/etc/preloaded-classes not found: %s\n",
strerror(errno));
return -1;
}
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, "");