From 6396e70d3fd381f6e3ccaff84c5a05bc5e3cec3c Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Thu, 31 May 2012 23:21:46 -0700 Subject: Multiple modules with the same name are going away. Change-Id: I4154db066865d6031caa3c2c3b94064b2f28076e --- updater/Android.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index fcaf6d531..38bb1ae95 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 \ + libz endif ifeq ($(HAVE_SELINUX), true) -- cgit v1.2.3 From 4eeb379886f9ee3d832a38805ceaf15e0e08d685 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Mon, 23 Jul 2012 19:14:30 -0700 Subject: Use the static version of libsparse Change-Id: I664f8dc7939f8f902e4775eaaf6476fcd4ab8ed2 --- updater/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index 38bb1ae95..8876120b0 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -23,7 +23,7 @@ LOCAL_CFLAGS += -DUSE_EXT4 LOCAL_C_INCLUDES += system/extras/ext4_utils LOCAL_STATIC_LIBRARIES += \ libext4_utils_static \ - libsparse \ + libsparse_static \ libz endif -- cgit v1.2.3