diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-12-22 20:18:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-22 20:18:14 +0000 |
| commit | 109495f5be3b7c9f5cb02c2fcaf6a9cf1debd708 (patch) | |
| tree | 65c58c77b3f59c9ed33373fff8cefe9ff9602067 | |
| parent | 848a54f54658ad253ff20a4eee4789d2f9266ba1 (diff) | |
| parent | 0297a3d8525eb0f94f2db83c59b3fb3a866f5389 (diff) | |
| download | bsdiff-109495f5be3b7c9f5cb02c2fcaf6a9cf1debd708.tar.gz | |
Merge "Make bsdiff available in recovery" am: eeb219b8d2 am: 84ddef2e0f am: 0297a3d852
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1930680
Change-Id: I314d2eeb5e7b63b0451d48d4ff0238d8fed89075
| -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. |