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

Merge "Remove support for image classes"

Browse Source 
am: 566bfcf475

Change-Id: I6795fe57078b679ef4077c751458603124d848e7
This commit is contained in:
Mathieu Chartier
2019-06-28 09:30:23 -07:00
committed by android-build-merger
parent c4d53ba7f3 566bfcf475
commit e8131249e5
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/jni/AndroidRuntime.cpp
View File

@@ -886,20 +886,16 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p
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");
ALOGE("Missing boot-image.prof file, /system/etc/boot-image.prof not found: %s\n",
strerror(errno));
return -1;
}
// If there is a dirty-image-objects file, push it.
if (hasFile("/system/etc/dirty-image-objects")) {
addOption("-Ximage-compiler-option");
addOption("--dirty-image-objects=/system/etc/dirty-image-objects");
}
// If there is a dirty-image-objects file, push it.
if (hasFile("/system/etc/dirty-image-objects")) {
addOption("-Ximage-compiler-option");
addOption("--dirty-image-objects=/system/etc/dirty-image-objects");
}
property_get("dalvik.vm.image-dex2oat-flags", dex2oatImageFlagsBuf, "");