commit e75db8070d6b01cd48317799f91bbfeefcdf184e
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Dec 23 02:16:39 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 23 02:16:39 2021 +0000
tree 65c58c77b3f59c9ed33373fff8cefe9ff9602067
parent fd82e672cfbcd9f4b823544cfc04f239f3c99928
parent 562383a4e47bb572ab020f31494c30ee2ebd5e3f

Merge "Snap for 8023979 from eeb219b8d2f9f10ce00149f4e9ee0fb34c41bcd7 to sdk-release" into sdk-release

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: [

OWNERS

diff --git a/OWNERS b/OWNERS
index ab036c1..b730db9 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,5 @@
 deymo@google.com
 senj@google.com
 xunchang@google.com
+zhangkelvin@google.com
+

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.