Merge "Fix the double free in verify_package_compatibility()." am: ce91df8293

am: dc388aab8b

Change-Id: I954027631743765ff3155a622a6618ac85056090
This commit is contained in:
Tao Bao
2017-04-18 03:31:49 +00:00
committed by android-build-merger

View File

@@ -544,7 +544,6 @@ bool verify_package_compatibility(ZipArchiveHandle package_zip) {
}
compatibility_info.emplace_back(std::move(content));
}
EndIteration(cookie);
CloseArchive(zip_handle);
// TODO(b/36814503): Enable the actual verification when VintfObject::CheckCompatibility() lands.