Update language to comply with Android’s inclusive language guidance (78d15141) · Commits · e / os / android_bootable_recovery

applypatch/imgdiff.cpp

+8 −7

Original line number	Diff line number	Diff line
		@@ -1038,20 +1038,21 @@ bool ZipModeImage::AddSplitImageFromChunkList(const ZipModeImage& tgt_image,
		split_tgt_image.Initialize(aligned_tgt_chunks, {});
		split_tgt_image.MergeAdjacentNormalChunks();

		// Construct the dummy source file based on the src_ranges.
		std::vector<uint8_t> src_content;
		// Construct the split source file based on the split src ranges.
		std::vector<uint8_t> split_src_content;
		for (const auto& r : split_src_ranges) {
		size_t end = std::min(src_image.file_content_.size(), r.second * BLOCK_SIZE);
		src_content.insert(src_content.end(), src_image.file_content_.begin() + r.first * BLOCK_SIZE,
		split_src_content.insert(split_src_content.end(),
		src_image.file_content_.begin() + r.first * BLOCK_SIZE,
		src_image.file_content_.begin() + end);
		}

		// We should not have an empty src in our design; otherwise we will encounter an error in
		// bsdiff since src_content.data() == nullptr.
		CHECK(!src_content.empty());
		// bsdiff since split_src_content.data() == nullptr.
		CHECK(!split_src_content.empty());

		ZipModeImage split_src_image(true);
		split_src_image.Initialize(split_src_chunks, src_content);
		split_src_image.Initialize(split_src_chunks, split_src_content);

		split_tgt_images->push_back(std::move(split_tgt_image));
		split_src_images->push_back(std::move(split_src_image));

applypatch/include/applypatch/imgdiff_image.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -211,7 +211,7 @@ class ZipModeImage : public Image {

		bool Initialize(const std::string& filename) override;

		// Initialize a dummy ZipModeImage from an existing ImageChunk vector. For src img pieces, we
		// Initialize a fake ZipModeImage from an existing ImageChunk vector. For src img pieces, we
		// reconstruct a new file_content based on the source ranges; but it's not needed for the tgt img
		// pieces; because for each chunk both the data and their offset within the file are unchanged.
		void Initialize(const std::vector<ImageChunk>& chunks, const std::vector<uint8_t>& file_content) {
		@@ -265,7 +265,7 @@ class ZipModeImage : public Image {
		const std::vector<ZipModeImage>& split_src_images,
		std::vector<SortedRangeSet>& split_src_ranges,
		size_t total_tgt_size);
		// Construct the dummy split images based on the chunks info and source ranges; and move them into
		// Construct the fake split images based on the chunks info and source ranges; and move them into
		// the given vectors. Return true if we add a new split image into \|split_tgt_images\|, and
		// false otherwise.
		static bool AddSplitImageFromChunkList(const ZipModeImage& tgt_image,

tests/testdata/ziptest_dummy-update.zip→tests/testdata/ziptest_fake-update.zip

(1.04 MiB)

File moved.

View file

tests/unit/install_test.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ TEST(InstallTest, read_metadata_from_package_smoke) {

		TEST(InstallTest, read_metadata_from_package_no_entry) {
		TemporaryFile temp_file;
		BuildZipArchive({ { "dummy_entry", "" } }, temp_file.release(), kCompressStored);
		BuildZipArchive({ { "fake_entry", "" } }, temp_file.release(), kCompressStored);

		ZipArchiveHandle zip;
		ASSERT_EQ(0, OpenArchive(temp_file.path, &zip));
		@@ -153,7 +153,7 @@ TEST(InstallTest, SetUpNonAbUpdateCommands) {
		TEST(InstallTest, SetUpNonAbUpdateCommands_MissingUpdateBinary) {
		TemporaryFile temp_file;
		// The archive must have something to be opened correctly.
		BuildZipArchive({ { "dummy_entry", "" } }, temp_file.release(), kCompressStored);
		BuildZipArchive({ { "fake_entry", "" } }, temp_file.release(), kCompressStored);

		// Missing update binary.
		ZipArchiveHandle zip;
		@@ -334,7 +334,7 @@ TEST(InstallTest, CheckPackageMetadata_device_type) {
		metadata = android::base::Join(
		std::vector<std::string>{
		"ota-type=BRICK",
		"pre-device=dummy_device_type",
		"pre-device=fake_device_type",
		},
		"\n");
		TestCheckPackageMetadata(metadata, OtaType::BRICK, false);
		@@ -358,7 +358,7 @@ TEST(InstallTest, CheckPackageMetadata_serial_number_smoke) {
		std::vector<std::string>{
		"ota-type=BRICK",
		"pre-device=" + device,
		"serialno=dummy_serial",
		"serialno=fake_serial",
		},
		"\n");
		TestCheckPackageMetadata(metadata, OtaType::BRICK, false);
		@@ -383,7 +383,7 @@ TEST(InstallTest, CheckPackageMetadata_multiple_serial_number) {
		ASSERT_NE("", serialno);

		std::vector<std::string> serial_numbers;
		// Creates a dummy serial number string.
		// Creates a fake serial number string.
		for (char c = 'a'; c <= 'z'; c++) {
		serial_numbers.emplace_back(serialno.size(), c);
		}
		@@ -431,7 +431,7 @@ TEST(InstallTest, CheckPackageMetadata_ab_build_version) {
		std::vector<std::string>{
		"ota-type=AB",
		"pre-device=" + device,
		"pre-build-incremental=dummy_build",
		"pre-build-incremental=fake_build",
		"post-timestamp=" + std::to_string(std::numeric_limits<int64_t>::max()),
		},
		"\n");
		@@ -459,7 +459,7 @@ TEST(InstallTest, CheckPackageMetadata_ab_fingerprint) {
		std::vector<std::string>{
		"ota-type=AB",
		"pre-device=" + device,
		"pre-build=dummy_build_fingerprint",
		"pre-build=fake_build_fingerprint",
		"post-timestamp=" + std::to_string(std::numeric_limits<int64_t>::max()),
		},
		"\n");
		@@ -487,7 +487,7 @@ TEST(InstallTest, CheckPackageMetadata_dynamic_fingerprint) {
		std::vector<std::string>{
		"ota-type=AB",
		"pre-device=" + device,
		"pre-build=dummy_build_fingerprint",
		"pre-build=fake_build_fingerprint",
		"post-timestamp=" + std::to_string(std::numeric_limits<int64_t>::max()),
		},
		"\n");

tests/unit/zip_test.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		#include "otautil/sysutil.h"

		TEST(ZipTest, OpenFromMemory) {
		std::string zip_path = from_testdata_base("ziptest_dummy-update.zip");
		std::string zip_path = from_testdata_base("ziptest_fake-update.zip");
		MemMapping map;
		ASSERT_TRUE(map.MapFile(zip_path));