diff options
| author | Alex Deymo <deymo@google.com> | 2016-07-29 13:36:42 -0700 |
|---|---|---|
| committer | Alex Deymo <deymo@google.com> | 2016-08-03 16:28:29 -0700 |
| commit | 2eea58f169079ecb113cb3b292462a775263df69 (patch) | |
| tree | a46d63ae7f2770126d1ee0dc18949deb33b691dc | |
| parent | b70ee1410349ead84048984d0ed081de0624c42e (diff) | |
| download | bsdiff-nougat-mr1-volantis-release.tar.gz | |
DO NOT MERGE: Build a static bspatch for recovery.android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-release
The recovery image must include only static binary. This patch compiles
bspatch as a static binary and installs it in recovery so it can be used
by update_engine_sideload.
Bug: 27178350
TEST=`mmma external/bsdiff` builds the recovery static file.
(cherry picked from commit 4bbeb1a12ddb13f9126015b2a51ae5b9394bcf9b)
Change-Id: I25bd1925b7b04434542a29cd23c2542607b46362
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 14 insertions, 0 deletions
@@ -62,6 +62,20 @@ LOCAL_C_INCLUDES += external/bzip2 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_src_files) \ + bspatch_main.cc +LOCAL_CFLAGS := $(bsdiff_common_cflags) +LOCAL_STATIC_LIBRARIES := \ + $(bsdiff_common_static_libs) +include $(BUILD_EXECUTABLE) # Host executables. |