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
This commit is contained in:
Mathieu Chartier
2019-06-28 15:56:58 +00:00
committed by Gerrit Code Review
parent 51b6c76660 96fab6e32d
commit 566bfcf475
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("-Ximage-compiler-option");
addOption("--compiler-filter=speed-profile"); addOption("--compiler-filter=speed-profile");
} else { } else {
// Make sure there is a preloaded-classes file. ALOGE("Missing boot-image.prof file, /system/etc/boot-image.prof not found: %s\n",
if (!hasFile("/system/etc/preloaded-classes")) { strerror(errno));
ALOGE("Missing preloaded-classes file, /system/etc/preloaded-classes not found: %s\n", return -1;
strerror(errno)); }
return -1;
}
addOption("-Ximage-compiler-option");
addOption("--image-classes=/system/etc/preloaded-classes");
// If there is a dirty-image-objects file, push it.
if (hasFile("/system/etc/dirty-image-objects")) { // If there is a dirty-image-objects file, push it.
addOption("-Ximage-compiler-option"); if (hasFile("/system/etc/dirty-image-objects")) {
addOption("--dirty-image-objects=/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, ""); property_get("dalvik.vm.image-dex2oat-flags", dex2oatImageFlagsBuf, "");