diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-12-22 19:49:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-22 19:49:22 +0000 |
| commit | 84ddef2e0f2af360da3c19df733e35ef0a245d15 (patch) | |
| tree | 65c58c77b3f59c9ed33373fff8cefe9ff9602067 | |
| parent | ee614bda9b9be36bf0b565548a5e5239f29f4385 (diff) | |
| parent | eeb219b8d2f9f10ce00149f4e9ee0fb34c41bcd7 (diff) | |
| download | bsdiff-84ddef2e0f2af360da3c19df733e35ef0a245d15.tar.gz | |
Merge "Make bsdiff available in recovery" am: eeb219b8d2
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1930680
Change-Id: I6357d15a86344ed3cabf960ef137d6c19f0fd9a1
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | patch_reader.cc | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -73,6 +73,7 @@ cc_library_static { cc_library_static { name: "libbsdiff", + recovery_available: true, defaults: ["bsdiff_defaults"], srcs: [ diff --git a/patch_reader.cc b/patch_reader.cc index e863b9a..6d317f3 100644 --- a/patch_reader.cc +++ b/patch_reader.cc @@ -32,7 +32,7 @@ bool BsdiffPatchReader::Init(const uint8_t* patch_data, size_t patch_size) { // extra block; seek forwards in oldfile by z bytes". if (patch_size < 32) { - LOG(ERROR) << "Too small to be a bspatch."; + LOG(ERROR) << "Too small to be a bspatch. " << patch_size; return false; } // Check for appropriate magic. |