diff options
| author | Sen Jiang <senj@google.com> | 2017-02-16 21:26:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-16 21:26:48 +0000 |
| commit | b9fa8599064d10afd8c231155500f0b8e934d71f (patch) | |
| tree | 94c9301be60df1239c531062454151ea68037f62 | |
| parent | 31acb6ef3a1d0d324a96094ef0568ce112a20e64 (diff) | |
| parent | fc06862afb375be57881831ae7fc256dfa215bc6 (diff) | |
| download | bsdiff-n-iot-preview-4.tar.gz | |
Merge changes from topic 'use_bspatch_from_external/bsdiff' am: 218dfb0239 am: ebd32bf165android-wear-o-preview-4android-wear-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4
am: fc06862afb
Change-Id: I71a757916772a332a06620ff8d80b1a235195f4d
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 0 insertions, 14 deletions
@@ -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) |