commit 769e011df40476a46902168d081d85862a55c9d9
author Alex Deymo <deymo@google.com> Wed Aug 03 00:47:55 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 03 00:47:55 2016 +0000
tree 6c19062f30167e87dd21ea2d01d7d95b2e6e0755
parent 0e2ce383d2c84be1cd1b31cf039f1bbc880d8d8b
parent f26b5b670aadde708d3279d1eb153d28b226304c

Merge "Build a static bspatch for recovery." am: 05ff27aaf4
am: f26b5b670a

Change-Id: I8271ed038f3bfb8bd14807bd2d99c6dbf617691a

Android.mk

diff --git a/Android.mk b/Android.mk
index 8409d6b..12ee3e8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -100,6 +100,20 @@
     $(bsdiff_common_static_libs)
 include $(BUILD_EXECUTABLE)
 
+# bspatch used in recovery by update_engine_sideload.
+include $(CLEAR_VARS)
+LOCAL_MODULE := bspatch_recovery
+LOCAL_MODULE_STEM := bspatch
+LOCAL_FORCE_STATIC_EXECUTABLE := true
+LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_SRC_FILES := bspatch_main.cc
+LOCAL_CFLAGS := $(bsdiff_common_cflags)
+LOCAL_STATIC_LIBRARIES := \
+    libbspatch \
+    $(bsdiff_common_static_libs)
+include $(BUILD_EXECUTABLE)
+
 # Host executables.
 
 include $(CLEAR_VARS)