Merge "Make otapreopt actually print dexopt error messages" (c0c5fae6) · Commits · e / os / android_frameworks_native

cmds/installd/otapreopt.cpp

+23 −18

Original line number	Diff line number	Diff line
		@@ -473,8 +473,8 @@ private:
		// Run dexopt with the parameters of parameters_.
		// TODO(calin): embed the profile name in the parameters.
		int Dexopt() {
		std::string dummy;
		return dexopt(parameters_.apk_path,
		std::string error;
		int res = dexopt(parameters_.apk_path,
		parameters_.uid,
		parameters_.pkgName,
		parameters_.instruction_set,
		@@ -490,7 +490,12 @@ private:
		parameters_.profile_name,
		parameters_.dex_metadata_path,
		parameters_.compilation_reason,
		&dummy);
		&error);
		if (res != 0) {
		LOG(ERROR) << "During preopt of " << parameters_.apk_path << " got result " << res
		<< " error: " << error;
		}
		return res;
		}

		int RunPreopt() {