commit a8ffb7a5f74684f993d1cd6058aa8871fddd2c59
author Sen Jiang <senj@google.com> Thu Feb 16 21:30:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 16 21:30:50 2017 +0000
tree 94c9301be60df1239c531062454151ea68037f62
parent f489e4005a57b38c09a13ae761e3534a1dc4e5d4
parent b9fa8599064d10afd8c231155500f0b8e934d71f

Merge changes from topic 'use_bspatch_from_external/bsdiff' am: 218dfb0239 am: ebd32bf165 am: fc06862afb
am: b9fa859906

Change-Id: I75f1bc46a3da3b30b98022d9d6a2b5918b4bcd90

Android.mk

diff --git a/Android.mk b/Android.mk
index 1073005..9116f83 100644
--- a/Android.mk
+++ b/Android.mk
@@ -104,20 +104,6 @@
     $(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)