Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]" (9c49e21d) · Commits · e / os / platform_frameworks_native

cmds/installd/commands.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -634,6 +634,10 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
		char dex2oat_Xmx_flag[PROPERTY_VALUE_MAX];
		bool have_dex2oat_Xmx_flag = property_get("dalvik.vm.dex2oat-Xmx", dex2oat_Xmx_flag, NULL) > 0;

		char dex2oat_compiler_filter_flag[PROPERTY_VALUE_MAX];
		bool have_dex2oat_compiler_filter_flag = property_get("dalvik.vm.dex2oat-filter",
		dex2oat_compiler_filter_flag, NULL) > 0;

		char dex2oat_flags[PROPERTY_VALUE_MAX];
		bool have_dex2oat_flags = property_get("dalvik.vm.dex2oat-flags", dex2oat_flags, NULL) > 0;
		ALOGV("dalvik.vm.dex2oat-flags=%s\n", dex2oat_flags);
		@@ -660,6 +664,7 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
		char top_k_profile_threshold_arg[strlen("--top-k-profile-threshold=") + PROPERTY_VALUE_MAX];
		char dex2oat_Xms_arg[strlen("-Xms") + PROPERTY_VALUE_MAX];
		char dex2oat_Xmx_arg[strlen("-Xmx") + PROPERTY_VALUE_MAX];
		char dex2oat_compiler_filter_arg[strlen("--compiler-filter=") + PROPERTY_VALUE_MAX];

		sprintf(zip_fd_arg, "--zip-fd=%d", zip_fd);
		sprintf(zip_location_arg, "--zip-location=%s", input_file_name);
		@@ -691,6 +696,9 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
		if (have_dex2oat_Xmx_flag) {
		sprintf(dex2oat_Xmx_arg, "-Xmx%s", dex2oat_Xmx_flag);
		}
		if (have_dex2oat_compiler_filter_flag) {
		sprintf(dex2oat_compiler_filter_arg, "--compiler-filter=%s", dex2oat_compiler_filter_flag);
		}

		ALOGV("Running %s in=%s out=%s\n", DEX2OAT_BIN, input_file_name, output_file_name);

		@@ -699,6 +707,7 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
		+ (have_top_k_profile_threshold ? 1 : 0)
		+ (have_dex2oat_Xms_flag ? 2 : 0)
		+ (have_dex2oat_Xmx_flag ? 2 : 0)
		+ (have_dex2oat_compiler_filter_flag ? 1 : 0)
		+ (have_dex2oat_flags ? 1 : 0)];
		int i = 0;
		argv[i++] = (char*)DEX2OAT_BIN;
		@@ -721,6 +730,9 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
		argv[i++] = (char*)RUNTIME_ARG;
		argv[i++] = dex2oat_Xmx_arg;
		}
		if (have_dex2oat_compiler_filter_flag) {
		argv[i++] = dex2oat_compiler_filter_arg;
		}
		if (have_dex2oat_flags) {
		argv[i++] = dex2oat_flags;
		}