diff options
author | Kelvin Zhang <zhangkelvin@google.com> | 2021-01-14 16:04:34 +0100 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-14 16:04:34 +0100 |
commit | e7a060a91b32cae86a01f3fc9ff3e81b99a6d552 (patch) | |
tree | 6f81e464fc1e55009a4143d5f33da84213053ef6 | |
parent | Merge "Disable failed imgpatch tests" (diff) | |
parent | Re-enable failed imgpatch tests (diff) | |
download | android_bootable_recovery-e7a060a91b32cae86a01f3fc9ff3e81b99a6d552.tar android_bootable_recovery-e7a060a91b32cae86a01f3fc9ff3e81b99a6d552.tar.gz android_bootable_recovery-e7a060a91b32cae86a01f3fc9ff3e81b99a6d552.tar.bz2 android_bootable_recovery-e7a060a91b32cae86a01f3fc9ff3e81b99a6d552.tar.lz android_bootable_recovery-e7a060a91b32cae86a01f3fc9ff3e81b99a6d552.tar.xz android_bootable_recovery-e7a060a91b32cae86a01f3fc9ff3e81b99a6d552.tar.zst android_bootable_recovery-e7a060a91b32cae86a01f3fc9ff3e81b99a6d552.zip |
Diffstat (limited to '')
-rw-r--r-- | applypatch/Android.bp | 15 | ||||
-rw-r--r-- | tests/Android.bp | 3 | ||||
-rw-r--r-- | tests/testdata/recovery-from-boot.p | bin | 5404 -> 5410 bytes | |||
-rw-r--r-- | tests/unit/applypatch_modes_test.cpp | 4 | ||||
-rw-r--r-- | tests/unit/applypatch_test.cpp | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/applypatch/Android.bp b/applypatch/Android.bp index 13a962584..80d8041b1 100644 --- a/applypatch/Android.bp +++ b/applypatch/Android.bp @@ -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", ], } diff --git a/tests/Android.bp b/tests/Android.bp index 19f2a6c64..d2179e494 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -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", ] diff --git a/tests/testdata/recovery-from-boot.p b/tests/testdata/recovery-from-boot.p Binary files differindex 06f6c299f..81738ed29 100644 --- a/tests/testdata/recovery-from-boot.p +++ b/tests/testdata/recovery-from-boot.p diff --git a/tests/unit/applypatch_modes_test.cpp b/tests/unit/applypatch_modes_test.cpp index 9e9797950..08414b796 100644 --- a/tests/unit/applypatch_modes_test.cpp +++ b/tests/unit/applypatch_modes_test.cpp @@ -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", diff --git a/tests/unit/applypatch_test.cpp b/tests/unit/applypatch_test.cpp index 4b80dcee9..218a224f8 100644 --- a/tests/unit/applypatch_test.cpp +++ b/tests/unit/applypatch_test.cpp @@ -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())); |