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

am: ebd32bf165

Change-Id: I2356faf1d11d71d15f571700b253871e3a2fac28
This commit is contained in:
Sen Jiang authored and android-build-merger committed 2017-02-16 21:23:20 +00:00
commit fc06862afb
1 file changed
-14
-14
View File
@@ -104,20 +104,6 @@ LOCAL_STATIC_LIBRARIES := \
$(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)