From 56fe5e71e5c52f24118b36d41da0b842cd082be1 Mon Sep 17 00:00:00 2001 From: Tom Marshall Date: Fri, 17 Apr 2015 05:23:00 -0700 Subject: recovery: Add lz4 libs if available * Required by transparent compresssion in make_ext4fs. Change-Id: I566c9e1281cc0dd725e96db32da0a1c3c000030e --- Android.mk | 6 ++++++ updater/Android.mk | 3 +++ 2 files changed, 9 insertions(+) diff --git a/Android.mk b/Android.mk index ddd2c7ded..27abb5e78 100644 --- a/Android.mk +++ b/Android.mk @@ -112,6 +112,9 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) LOCAL_CFLAGS += -DUSE_EXT4 LOCAL_C_INCLUDES += system/extras/ext4_utils LOCAL_SHARED_LIBRARIES += libext4_utils + ifneq ($(wildcard external/lz4/Android.mk),) + LOCAL_STATIC_LIBRARIES += liblz4-static + endif endif ifneq ($(wildcard external/libselinux/Android.mk),) TWHAVE_SELINUX := true @@ -129,6 +132,9 @@ ifeq ($(TWHAVE_SELINUX), true) LOCAL_CFLAGS += -DUSE_EXT4 LOCAL_C_INCLUDES += system/extras/ext4_utils LOCAL_SHARED_LIBRARIES += libext4_utils + ifneq ($(wildcard external/lz4/Android.mk),) + LOCAL_STATIC_LIBRARIES += liblz4-static + endif endif endif diff --git a/updater/Android.mk b/updater/Android.mk index 0045d6fa7..3fbeef39f 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -38,6 +38,9 @@ LOCAL_STATIC_LIBRARIES = \ libsparse_static \ libz endif +ifneq ($(wildcard external/lz4/Android.mk),) + LOCAL_STATIC_LIBRARIES += liblz4-static +endif endif LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS) -- cgit v1.2.3