summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Marshall <tdm@cyngn.com>2015-04-17 14:23:00 +0200
committerDees Troy <dees_troy@teamw.in>2015-05-19 21:06:12 +0200
commit56fe5e71e5c52f24118b36d41da0b842cd082be1 (patch)
treee24a550376094bb284d59bec20d2745213ee7bb5
parentpartitionmanager: remove broken and unused progress calculation code (diff)
downloadandroid_bootable_recovery-56fe5e71e5c52f24118b36d41da0b842cd082be1.tar
android_bootable_recovery-56fe5e71e5c52f24118b36d41da0b842cd082be1.tar.gz
android_bootable_recovery-56fe5e71e5c52f24118b36d41da0b842cd082be1.tar.bz2
android_bootable_recovery-56fe5e71e5c52f24118b36d41da0b842cd082be1.tar.lz
android_bootable_recovery-56fe5e71e5c52f24118b36d41da0b842cd082be1.tar.xz
android_bootable_recovery-56fe5e71e5c52f24118b36d41da0b842cd082be1.tar.zst
android_bootable_recovery-56fe5e71e5c52f24118b36d41da0b842cd082be1.zip
-rw-r--r--Android.mk6
-rw-r--r--updater/Android.mk3
2 files changed, 9 insertions, 0 deletions
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)