aboutsummaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2012-08-17 00:11:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-17 00:11:55 -0700
commit5585025814418e8b692a3a38b7cff495180a74f8 (patch)
treec57f64b8c57c1ebd314f75f61b827bd57422f8ea /updater
parentf510f069fd35eb259799f594975c1a990e41d870 (diff)
parent3733d2185bbcedd9ef626907f1f32628986cc0f5 (diff)
downloadbootable_recovery-5585025814418e8b692a3a38b7cff495180a74f8.zip
bootable_recovery-5585025814418e8b692a3a38b7cff495180a74f8.tar.gz
bootable_recovery-5585025814418e8b692a3a38b7cff495180a74f8.tar.bz2
am 3733d218: Merge changes I664f8dc7,I4154db06,I5e1df90f
* commit '3733d2185bbcedd9ef626907f1f32628986cc0f5': Use the static version of libsparse Multiple modules with the same name are going away. host modules don't need LOCAL_MODULE_TAGS
Diffstat (limited to 'updater')
-rw-r--r--updater/Android.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/updater/Android.mk b/updater/Android.mk
index fcaf6d5..8876120 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -21,7 +21,10 @@ LOCAL_SRC_FILES := $(updater_src_files)
ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
LOCAL_CFLAGS += -DUSE_EXT4
LOCAL_C_INCLUDES += system/extras/ext4_utils
-LOCAL_STATIC_LIBRARIES += libext4_utils libsparse libz
+LOCAL_STATIC_LIBRARIES += \
+ libext4_utils_static \
+ libsparse_static \
+ libz
endif
ifeq ($(HAVE_SELINUX), true)