Merge "Track libziparchive API change." (9423d2f6) · Commits · e / os / android_bootable_recovery

install/install.cpp

+5 −10

Original line number	Diff line number	Diff line
		@@ -73,9 +73,8 @@ bool ReadMetadataFromPackage(ZipArchiveHandle zip, std::map<std::string, std::st
		CHECK(metadata != nullptr);

		static constexpr const char* METADATA_PATH = "META-INF/com/android/metadata";
		ZipString path(METADATA_PATH);
		ZipEntry entry;
		if (FindEntry(zip, path, &entry) != 0) {
		if (FindEntry(zip, METADATA_PATH, &entry) != 0) {
		LOG(ERROR) << "Failed to find " << METADATA_PATH;
		return false;
		}
		@@ -236,9 +235,8 @@ bool SetUpAbUpdateCommands(const std::string& package, ZipArchiveHandle zip, int
		// For A/B updates we extract the payload properties to a buffer and obtain the RAW payload offset
		// in the zip file.
		static constexpr const char* AB_OTA_PAYLOAD_PROPERTIES = "payload_properties.txt";
		ZipString property_name(AB_OTA_PAYLOAD_PROPERTIES);
		ZipEntry properties_entry;
		if (FindEntry(zip, property_name, &properties_entry) != 0) {
		if (FindEntry(zip, AB_OTA_PAYLOAD_PROPERTIES, &properties_entry) != 0) {
		LOG(ERROR) << "Failed to find " << AB_OTA_PAYLOAD_PROPERTIES;
		return false;
		}
		@@ -252,9 +250,8 @@ bool SetUpAbUpdateCommands(const std::string& package, ZipArchiveHandle zip, int
		}

		static constexpr const char* AB_OTA_PAYLOAD = "payload.bin";
		ZipString payload_name(AB_OTA_PAYLOAD);
		ZipEntry payload_entry;
		if (FindEntry(zip, payload_name, &payload_entry) != 0) {
		if (FindEntry(zip, AB_OTA_PAYLOAD, &payload_entry) != 0) {
		LOG(ERROR) << "Failed to find " << AB_OTA_PAYLOAD;
		return false;
		}
		@@ -275,9 +272,8 @@ bool SetUpNonAbUpdateCommands(const std::string& package, ZipArchiveHandle zip,

		// In non-A/B updates we extract the update binary from the package.
		static constexpr const char* UPDATE_BINARY_NAME = "META-INF/com/google/android/update-binary";
		ZipString binary_name(UPDATE_BINARY_NAME);
		ZipEntry binary_entry;
		if (FindEntry(zip, binary_name, &binary_entry) != 0) {
		if (FindEntry(zip, UPDATE_BINARY_NAME, &binary_entry) != 0) {
		LOG(ERROR) << "Failed to find update binary " << UPDATE_BINARY_NAME;
		return false;
		}
		@@ -508,9 +504,8 @@ bool verify_package_compatibility(ZipArchiveHandle package_zip) {
		LOG(INFO) << "Verifying package compatibility...";

		static constexpr const char* COMPATIBILITY_ZIP_ENTRY = "compatibility.zip";
		ZipString compatibility_entry_name(COMPATIBILITY_ZIP_ENTRY);
		ZipEntry compatibility_entry;
		if (FindEntry(package_zip, compatibility_entry_name, &compatibility_entry) != 0) {
		if (FindEntry(package_zip, COMPATIBILITY_ZIP_ENTRY, &compatibility_entry) != 0) {
		LOG(INFO) << "Package doesn't contain " << COMPATIBILITY_ZIP_ENTRY << " entry";
		return true;
		}

install/wipe_device.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -49,9 +49,8 @@ std::vector<std::string> GetWipePartitionList(Package* wipe_package) {
		constexpr char RECOVERY_WIPE_ENTRY_NAME[] = "recovery.wipe";

		std::string partition_list_content;
		ZipString path(RECOVERY_WIPE_ENTRY_NAME);
		ZipEntry entry;
		if (FindEntry(zip, path, &entry) == 0) {
		if (FindEntry(zip, RECOVERY_WIPE_ENTRY_NAME, &entry) == 0) {
		uint32_t length = entry.uncompressed_length;
		partition_list_content = std::string(length, '\0');
		if (auto err = ExtractToMemory(

tests/unit/install_test.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -271,9 +271,8 @@ static void VerifyAbUpdateCommands(const std::string& serialno, bool success = t

		ZipArchiveHandle zip;
		ASSERT_EQ(0, OpenArchive(temp_file.path, &zip));
		ZipString payload_name("payload.bin");
		ZipEntry payload_entry;
		ASSERT_EQ(0, FindEntry(zip, payload_name, &payload_entry));
		ASSERT_EQ(0, FindEntry(zip, "payload.bin", &payload_entry));

		std::map<std::string, std::string> metadata;
		ASSERT_TRUE(ReadMetadataFromPackage(zip, &metadata));

tests/unit/package_test.cpp

+2 −3

Original line number	Diff line number	Diff line
		@@ -105,10 +105,9 @@ TEST_F(PackageTest, GetZipArchiveHandle_extract_entry) {
		ASSERT_TRUE(zip);

		// Check that we can extract one zip entry.
		std::string entry_name = "dir1/file3.txt";
		ZipString path(entry_name.c_str());
		std::string_view entry_name = "dir1/file3.txt";
		ZipEntry entry;
		ASSERT_EQ(0, FindEntry(zip, path, &entry));
		ASSERT_EQ(0, FindEntry(zip, entry_name, &entry));

		std::vector<uint8_t> extracted(entry_name.size());
		ASSERT_EQ(0, ExtractToMemory(zip, &entry, extracted.data(), extracted.size()));

tests/unit/zip_test.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -37,10 +37,9 @@ TEST(ZipTest, OpenFromMemory) {
		ASSERT_EQ(0, OpenArchiveFromMemory(map.addr, map.length, zip_path.c_str(), &handle));

		static constexpr const char* BINARY_PATH = "META-INF/com/google/android/update-binary";
		ZipString binary_path(BINARY_PATH);
		ZipEntry binary_entry;
		// Make sure the package opens correctly and its entry can be read.
		ASSERT_EQ(0, FindEntry(handle, binary_path, &binary_entry));
		ASSERT_EQ(0, FindEntry(handle, BINARY_PATH, &binary_entry));

		TemporaryFile tmp_binary;
		ASSERT_NE(-1, tmp_binary.fd);