Merge "Avoid preloading classes for boot image profiling" am: cfee28589b am: 84f358f9bf am: ac60bbb740

am: fca111db2f

Change-Id: Ic28857abef951581a7627e3805ccd3db49c03391
This commit is contained in:
Mathieu Chartier
2019-10-25 13:27:34 -07:00
committed by android-build-merger

View File

@@ -254,6 +254,18 @@ public class ZygoteInit {
InputStream is;
try {
// If we are profiling the boot image, avoid preloading classes.
// Can't use device_config since we are the zygote.
String prop = SystemProperties.get(
"persist.device_config.runtime_native_boot.profilebootclasspath", "");
// Might be empty if the property is unset since the default is "".
if (prop.length() == 0) {
prop = SystemProperties.get("dalvik.vm.profilebootclasspath", "");
}
if ("true".equals(prop)) {
return;
}
is = new FileInputStream(PRELOADED_CLASSES);
} catch (FileNotFoundException e) {
Log.e(TAG, "Couldn't find " + PRELOADED_CLASSES + ".");