Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7a060a9 authored Jan 14, 2021 by Kelvin Zhang Committed by Gerrit Code Review Jan 14, 2021

Merge changes from topic "imgdiff"

* changes:
  Re-enable failed imgpatch tests
  Switch imgdiff to use libz_stable

parents 043ef5ff 07ba4483

applypatch/Android.bp

+8 −7

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ cc_library_static {
		"libbz",
		"libedify",
		"libotautil",
		"libz",
		"libz_stable",
		],

		shared_libs: [
		@@ -71,6 +71,7 @@ cc_library_static {
		cc_library_static {
		name: "libapplypatch_modes",
		vendor_available: true,
		host_supported: true,

		defaults: [
		"applypatch_defaults",
		@@ -95,6 +96,7 @@ cc_library_static {
		cc_binary {
		name: "applypatch",
		vendor: true,
		host_supported: true,

		defaults: [
		"applypatch_defaults",
		@@ -120,7 +122,7 @@ cc_binary {
		"libbase",
		"libcrypto",
		"liblog",
		"libz",
		"libz_stable",
		"libziparchive",
		],

		@@ -129,9 +131,9 @@ cc_binary {
		],
		}

		cc_library_host_static {
		cc_library_static {
		name: "libimgdiff",

		host_supported: true,
		defaults: [
		"applypatch_defaults",
		],
		@@ -152,14 +154,13 @@ cc_library_host_static {
		"liblog",
		"libotautil",
		"libutils",
		"libz",
		"libz_stable",
		"libziparchive",
		],
		}

		cc_binary_host {
		name: "imgdiff",

		srcs: [
		"imgdiff_main.cpp",
		],
		@@ -180,6 +181,6 @@ cc_binary_host {
		"liblog",
		"libbrotli",
		"libbz",
		"libz",
		"libz_stable",
		],
		}

tests/Android.bp

+1 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ cc_defaults {
		"libpng",
		"libprocessgroup",
		"libselinux",
		"libz",
		"libziparchive",
		],

		@@ -65,7 +64,7 @@ libapplypatch_static_libs = [
		"libbase",
		"libbrotli",
		"libbz",
		"libz",
		"libz_stable",
		"libziparchive",
		]

tests/testdata/recovery-from-boot.p

+6 B (5.28 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file

tests/unit/applypatch_modes_test.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ TEST_F(ApplyPatchModesTest, InvalidArgs) {
		ASSERT_EQ(2, InvokeApplyPatchModes({ "applypatch", "-x" }));
		}

		TEST_F(ApplyPatchModesTest, DISABLED_PatchModeEmmcTarget) {
		TEST_F(ApplyPatchModesTest, PatchModeEmmcTarget) {
		std::vector<std::string> args{
		"applypatch",
		"--bonus",
		@@ -118,7 +118,7 @@ TEST_F(ApplyPatchModesTest, DISABLED_PatchModeEmmcTarget) {

		// Tests patching an eMMC target without a separate bonus file (i.e. recovery-from-boot patch has
		// everything).
		TEST_F(ApplyPatchModesTest, DISABLED_PatchModeEmmcTargetWithoutBonusFile) {
		TEST_F(ApplyPatchModesTest, PatchModeEmmcTargetWithoutBonusFile) {
		std::vector<std::string> args{
		"applypatch", "--patch", from_testdata_base("recovery-from-boot-with-bonus.p"),
		"--target", target, "--source",

tests/unit/applypatch_test.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ TEST_F(ApplyPatchTest, PatchPartitionCheck_UseBackup_BothCorrupted) {
		PatchPartitionCheck(target_partition, Partition(target_file, source_size, source_sha1)));
		}

		TEST_F(ApplyPatchTest, DISABLED_PatchPartition) {
		TEST_F(ApplyPatchTest, PatchPartition) {
		FileContents patch_fc;
		ASSERT_TRUE(LoadFileContents(from_testdata_base("recovery-from-boot.p"), &patch_fc));
		Value patch(Value::Type::BLOB, std::string(patch_fc.data.cbegin(), patch_fc.data.cend()));
		@@ -146,7 +146,7 @@ TEST_F(ApplyPatchTest, DISABLED_PatchPartition) {

		// Tests patching an eMMC target without a separate bonus file (i.e. recovery-from-boot patch has
		// everything).
		TEST_F(ApplyPatchTest, DISABLED_PatchPartitionWithoutBonusFile) {
		TEST_F(ApplyPatchTest, PatchPartitionWithoutBonusFile) {
		FileContents patch_fc;
		ASSERT_TRUE(LoadFileContents(from_testdata_base("recovery-from-boot-with-bonus.p"), &patch_fc));
		Value patch(Value::Type::BLOB, std::string(patch_fc.data.cbegin(), patch_fc.data.cend()));