diff options
| author | Sen Jiang <senj@google.com> | 2017-02-16 21:19:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-16 21:19:10 +0000 |
| commit | ebd32bf1655f6ec13e7df1cc88452351c9663190 (patch) | |
| tree | 94c9301be60df1239c531062454151ea68037f62 | |
| parent | 9e29277587ccc2384c2fe36db7cb93b4be1917ea (diff) | |
| parent | 218dfb0239d17e53cf5ffea4e5e3699312d4318e (diff) | |
| download | bsdiff-ebd32bf1655f6ec13e7df1cc88452351c9663190.tar.gz | |
Merge changes from topic 'use_bspatch_from_external/bsdiff'
am: 218dfb0239
Change-Id: Ie174a6475b2de56e22e351b9efd61feca9eaa987
| -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) |