Merge "Split dirty-image-objects file between art and framework" into main (27c724e2) · Commits · e / os / android_frameworks_base

config/dirty-image-objects

+1427 −1702

File changed.

Preview size limit exceeded, changes collapsed.

+12 −4

Original line number	Diff line number	Diff line
		@@ -1022,10 +1022,18 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv, bool zygote, bool p
		parseCompilerOption("dalvik.vm.image-dex2oat-filter", dex2oatImageCompilerFilterBuf,
		"--compiler-filter=", "-Ximage-compiler-option");

		// If there is a dirty-image-objects file, push it.
		if (hasFile("/system/etc/dirty-image-objects")) {
		// If there are dirty-image-objects files, push them.
		const char* dirty_image_objects_options[] = {
		"--dirty-image-objects=/apex/com.android.art/etc/dirty-image-objects",
		"--dirty-image-objects=/system/etc/dirty-image-objects",
		};
		for (const char* option : dirty_image_objects_options) {
		// Get the file path by finding the first '/' and check if
		// this file exists.
		if (hasFile(strchr(option, '/'))) {
		addOption("-Ximage-compiler-option");
		addOption("--dirty-image-objects=/system/etc/dirty-image-objects");
		addOption(option);
		}
		}

		parseCompilerOption("dalvik.vm.image-dex2oat-threads", dex2oatThreadsImageBuf, "-j",