From ace7623306e715bc366e726a0ad844156f00445d Mon Sep 17 00:00:00 2001 From: Greg Wallace Date: Wed, 27 Jan 2016 17:15:51 -0500 Subject: Flag to enable jpg support Builder using a custom theme may have need for this. Add a flag to easily enable jpg support. Change-Id: Ica74f8cb1312d3193105f2201a5cf8073e2edc82 --- minuitwrp/Android.mk | 10 ++++++++-- prebuilt/Android.mk | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk index 7f6b727b8..811685c0e 100644 --- a/minuitwrp/Android.mk +++ b/minuitwrp/Android.mk @@ -58,7 +58,11 @@ LOCAL_C_INCLUDES += \ external/freetype/include \ external/libcxx/include -#external/jpeg \ +ifneq ($(TW_INCLUDE_JPEG),) + LOCAL_C_INCLUDES += \ + external/jpeg + LOCAL_CFLAGS += -DTW_INCLUDE_JPEG +endif ifeq ($(RECOVERY_TOUCHSCREEN_SWAP_XY), true) LOCAL_CFLAGS += -DRECOVERY_TOUCHSCREEN_SWAP_XY @@ -169,7 +173,9 @@ LOCAL_CLANG := true LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\" LOCAL_SHARED_LIBRARIES += libft2 libz libc libcutils libpng libutils -#libjpeg +ifneq ($(TW_INCLUDE_JPEG),) + LOCAL_SHARED_LIBRARIES += libjpeg +endif LOCAL_STATIC_LIBRARIES += libpixelflinger_twrp LOCAL_MODULE_TAGS := eng LOCAL_MODULE := libminuitwrp diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index f1cdc90db..dba181003 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -122,7 +122,9 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext4_utils.so endif RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libaosprecovery.so -#RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libjpeg.so +ifneq ($(TW_INCLUDE_JPEG),) + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libjpeg.so +endif ifeq ($(TWHAVE_SELINUX), true) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libselinux.so ifneq ($(TARGET_USERIMAGES_USE_EXT4), true) -- cgit v1.2.3