Merge "Disable compilation based on vold.decrypt. [frameworks/native]" (74b3ecf4) · Commits · e / os / android_frameworks_native-old

cmds/installd/commands.c

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -642,6 +642,13 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
	bool have_dex2oat_flags = property_get("dalvik.vm.dex2oat-flags", dex2oat_flags, NULL) > 0;		bool have_dex2oat_flags = property_get("dalvik.vm.dex2oat-flags", dex2oat_flags, NULL) > 0;
	ALOGV("dalvik.vm.dex2oat-flags=%s\n", dex2oat_flags);		ALOGV("dalvik.vm.dex2oat-flags=%s\n", dex2oat_flags);

			// If we booting without the real /data, don't spend time compiling.
			char vold_decrypt[PROPERTY_VALUE_MAX];
			bool have_vold_decrypt = property_get("vold.decrypt", vold_decrypt, "") > 0;
			bool skip_compilation = (have_vold_decrypt &&
			(strcmp(vold_decrypt, "trigger_restart_min_framework") == 0 \|\|
			(strcmp(vold_decrypt, "1") == 0)));

	static const char* DEX2OAT_BIN = "/system/bin/dex2oat";		static const char* DEX2OAT_BIN = "/system/bin/dex2oat";

	static const char* RUNTIME_ARG = "--runtime-arg";		static const char* RUNTIME_ARG = "--runtime-arg";
	@@ -696,7 +703,10 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
	if (have_dex2oat_Xmx_flag) {		if (have_dex2oat_Xmx_flag) {
	sprintf(dex2oat_Xmx_arg, "-Xmx%s", dex2oat_Xmx_flag);		sprintf(dex2oat_Xmx_arg, "-Xmx%s", dex2oat_Xmx_flag);
	}		}
	if (have_dex2oat_compiler_filter_flag) {		if (skip_compilation) {
			strcpy(dex2oat_compiler_filter_arg, "--compiler-filter=interpret-only");
			have_dex2oat_compiler_filter_flag = true;
			} else if (have_dex2oat_compiler_filter_flag) {
	sprintf(dex2oat_compiler_filter_arg, "--compiler-filter=%s", dex2oat_compiler_filter_flag);		sprintf(dex2oat_compiler_filter_arg, "--compiler-filter=%s", dex2oat_compiler_filter_flag);
	}		}