Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 989a2859 authored Jul 17, 2012 by Colin Cross Committed by android code review Jul 17, 2012

Merge "Link against libsparse"

parents ea17e320 cde94f30

Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ LOCAL_STATIC_LIBRARIES :=
		ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
		LOCAL_CFLAGS += -DUSE_EXT4
		LOCAL_C_INCLUDES += system/extras/ext4_utils
		LOCAL_STATIC_LIBRARIES += libext4_utils libz
		LOCAL_STATIC_LIBRARIES += libext4_utils libsparse libz
		endif

		ifeq ($(HAVE_SELINUX), true)
		@@ -46,7 +46,7 @@ ifeq ($(TARGET_RECOVERY_UI_LIB),)
		else
		LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UI_LIB)
		endif
		LOCAL_STATIC_LIBRARIES += libext4_utils
		LOCAL_STATIC_LIBRARIES += libext4_utils libsparse
		LOCAL_STATIC_LIBRARIES += libminzip libz libmtdutils libmincrypt libminadbd
		LOCAL_STATIC_LIBRARIES += libminui libpixelflinger_static libpng libcutils
		LOCAL_STATIC_LIBRARIES += libstdc++ libc

updater/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ 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 libz
		LOCAL_STATIC_LIBRARIES += libext4_utils libsparse libz
		endif

		ifeq ($(HAVE_SELINUX), true)