Merge "Add boot profile support" am: 3d901ec513 (3fcea88d) · Commits · e / os / android_frameworks_base

core/jni/AndroidRuntime.cpp

+20 −12

Original line number	Original line	Diff line number	Diff line
	@@ -795,6 +795,13 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv, bool zygote)
	"--compiler-filter=", "-Ximage-compiler-option");		"--compiler-filter=", "-Ximage-compiler-option");
	}		}

			// 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("--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.		// Make sure there is a preloaded-classes file.
	if (!hasFile("/system/etc/preloaded-classes")) {		if (!hasFile("/system/etc/preloaded-classes")) {
	ALOGE("Missing preloaded-classes file, /system/etc/preloaded-classes not found: %s\n",		ALOGE("Missing preloaded-classes file, /system/etc/preloaded-classes not found: %s\n",
	@@ -809,6 +816,7 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv, bool zygote)
	addOption("-Ximage-compiler-option");		addOption("-Ximage-compiler-option");
	addOption("--compiled-classes=/system/etc/compiled-classes");		addOption("--compiled-classes=/system/etc/compiled-classes");
	}		}
			}

	property_get("dalvik.vm.image-dex2oat-flags", dex2oatImageFlagsBuf, "");		property_get("dalvik.vm.image-dex2oat-flags", dex2oatImageFlagsBuf, "");
	parseExtraOpts(dex2oatImageFlagsBuf, "-Ximage-compiler-option");		parseExtraOpts(dex2oatImageFlagsBuf, "-Ximage-compiler-option");