diff options
| author | Sen Jiang <senj@google.com> | 2017-02-16 21:30:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-16 21:30:50 +0000 |
| commit | a8ffb7a5f74684f993d1cd6058aa8871fddd2c59 (patch) | |
| tree | 94c9301be60df1239c531062454151ea68037f62 | |
| parent | f489e4005a57b38c09a13ae761e3534a1dc4e5d4 (diff) | |
| parent | b9fa8599064d10afd8c231155500f0b8e934d71f (diff) | |
| download | bsdiff-oreo-dev.tar.gz | |
Merge changes from topic 'use_bspatch_from_external/bsdiff' am: 218dfb0239 am: ebd32bf165 am: fc06862afbandroid-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-release
am: b9fa859906
Change-Id: I75f1bc46a3da3b30b98022d9d6a2b5918b4bcd90
| -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) |