Merge "Remove support for image classes" am: 566bfcf475 (fd36670b) · Commits · e / os / android_frameworks_base

core/jni/AndroidRuntime.cpp

+9 −13

Original line number	Diff line number	Diff line
		@@ -899,21 +899,17 @@ 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",
		ALOGE("Missing boot-image.prof file, /system/etc/boot-image.prof not found: %s\n",
		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")) {
		addOption("-Ximage-compiler-option");
		addOption("--dirty-image-objects=/system/etc/dirty-image-objects");
		}
		}

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