Merge "Link against libsparse"

This commit is contained in:
Colin Cross
2012-07-17 18:32:27 -07:00
committed by android code review
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -25,7 +25,7 @@ LOCAL_STATIC_LIBRARIES :=
ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
LOCAL_CFLAGS += -DUSE_EXT4 LOCAL_CFLAGS += -DUSE_EXT4
LOCAL_C_INCLUDES += system/extras/ext4_utils LOCAL_C_INCLUDES += system/extras/ext4_utils
LOCAL_STATIC_LIBRARIES += libext4_utils libz LOCAL_STATIC_LIBRARIES += libext4_utils libsparse libz
endif endif
ifeq ($(HAVE_SELINUX), true) ifeq ($(HAVE_SELINUX), true)
@@ -46,7 +46,7 @@ ifeq ($(TARGET_RECOVERY_UI_LIB),)
else else
LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UI_LIB) LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UI_LIB)
endif endif
LOCAL_STATIC_LIBRARIES += libext4_utils LOCAL_STATIC_LIBRARIES += libext4_utils libsparse
LOCAL_STATIC_LIBRARIES += libminzip libz libmtdutils libmincrypt libminadbd LOCAL_STATIC_LIBRARIES += libminzip libz libmtdutils libmincrypt libminadbd
LOCAL_STATIC_LIBRARIES += libminui libpixelflinger_static libpng libcutils LOCAL_STATIC_LIBRARIES += libminui libpixelflinger_static libpng libcutils
LOCAL_STATIC_LIBRARIES += libstdc++ libc LOCAL_STATIC_LIBRARIES += libstdc++ libc
+1 -1
View File
@@ -21,7 +21,7 @@ LOCAL_SRC_FILES := $(updater_src_files)
ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
LOCAL_CFLAGS += -DUSE_EXT4 LOCAL_CFLAGS += -DUSE_EXT4
LOCAL_C_INCLUDES += system/extras/ext4_utils LOCAL_C_INCLUDES += system/extras/ext4_utils
LOCAL_STATIC_LIBRARIES += libext4_utils libz LOCAL_STATIC_LIBRARIES += libext4_utils libsparse libz
endif endif
ifeq ($(HAVE_SELINUX), true) ifeq ($(HAVE_SELINUX), true)