Merge "Unconditionally unlink image." into oc-mr1-dev (19d9cf4d) · Commits · e / os / android_frameworks_native

cmds/installd/dexopt.cpp

+11 −4

Original line number	Diff line number	Diff line
		@@ -1137,10 +1137,9 @@ class Dex2oatFileWrapper {
		// (re)Creates the app image if needed.
		Dex2oatFileWrapper maybe_open_app_image(const char* out_oat_path, bool profile_guided,
		bool is_public, int uid, bool is_secondary_dex) {
		// Use app images only if it is enabled (by a set image format) and we are compiling
		// profile-guided (so the app image doesn't conservatively contain all classes).
		// Note that we don't create an image for secondary dex files.
		if (is_secondary_dex \|\| !profile_guided) {

		// We don't create an image for secondary dex files.
		if (is_secondary_dex) {
		return Dex2oatFileWrapper();
		}

		@@ -1149,6 +1148,14 @@ Dex2oatFileWrapper maybe_open_app_image(const char* out_oat_path, bool profile_g
		// Happens when the out_oat_path has an unknown extension.
		return Dex2oatFileWrapper();
		}

		// Use app images only if it is enabled (by a set image format) and we are compiling
		// profile-guided (so the app image doesn't conservatively contain all classes).
		if (!profile_guided) {
		// In case there is a stale image, remove it now. Ignore any error.
		unlink(image_path.c_str());
		return Dex2oatFileWrapper();
		}
		char app_image_format[kPropertyValueMax];
		bool have_app_image_format =
		get_property("dalvik.vm.appimageformat", app_image_format, NULL) > 0;