commit eeb219b8d2f9f10ce00149f4e9ee0fb34c41bcd7
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 22 19:36:48 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 22 19:36:48 2021 +0000
tree 65c58c77b3f59c9ed33373fff8cefe9ff9602067
parent 03442a10c495ce3a2e7ccf0ca003ca4dd95aae09
parent 67386a2f62044aefd8bdb057b5ed0bc47e377d5c

Merge "Make bsdiff available in recovery"

Android.bp

diff --git a/Android.bp b/Android.bp
index ee6dc4f..3541d03 100644
--- a/Android.bp
+++ b/Android.bp
@@ -73,6 +73,7 @@
 
 cc_library_static {
     name: "libbsdiff",
+    recovery_available: true,
     defaults: ["bsdiff_defaults"],
 
     srcs: [

patch_reader.cc

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 @@
   // 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.