From e95c4868b9ba215e858294fb4d0bfbf2634d01f4 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Wed, 27 Jan 2016 10:57:26 -0600 Subject: [PATCH] ifdef and comment out libjpeg Chances are there are not many themes in widespread use that are using jpeg images, but this will be easy to revert back or even just temporarily modify if we need jpeg support in a pinch. Change-Id: If17b05ce3ebccce724fd74b26ed8ea91b287c3cf --- gui/theme/landscape_hdpi/splash.xml | 3 +-- gui/theme/landscape_hdpi/ui.xml | 2 +- gui/theme/landscape_mdpi/splash.xml | 3 +-- gui/theme/landscape_mdpi/ui.xml | 2 +- gui/theme/portrait_hdpi/splash.xml | 3 +-- gui/theme/portrait_hdpi/ui.xml | 2 +- gui/theme/portrait_mdpi/splash.xml | 3 +-- gui/theme/portrait_mdpi/ui.xml | 2 +- gui/theme/watch_mdpi/splash.xml | 3 +-- gui/theme/watch_mdpi/ui.xml | 2 +- minuitwrp/Android.mk | 6 ++++-- minuitwrp/resources.cpp | 8 ++++++++ prebuilt/Android.mk | 2 +- 13 files changed, 23 insertions(+), 18 deletions(-) diff --git a/gui/theme/landscape_hdpi/splash.xml b/gui/theme/landscape_hdpi/splash.xml index 1a9fd534..cbadcde7 100755 --- a/gui/theme/landscape_hdpi/splash.xml +++ b/gui/theme/landscape_hdpi/splash.xml @@ -4,8 +4,7 @@ TeamWin TWRP - Default basic theme - preview.jpg + splash screen 1 diff --git a/gui/theme/landscape_hdpi/ui.xml b/gui/theme/landscape_hdpi/ui.xml index 1246b754..2e263520 100644 --- a/gui/theme/landscape_hdpi/ui.xml +++ b/gui/theme/landscape_hdpi/ui.xml @@ -5,7 +5,7 @@ TeamWin Backup Naowz Default basic theme - preview.jpg + preview.png 1 diff --git a/gui/theme/landscape_mdpi/splash.xml b/gui/theme/landscape_mdpi/splash.xml index 34f83257..d4f16fcd 100755 --- a/gui/theme/landscape_mdpi/splash.xml +++ b/gui/theme/landscape_mdpi/splash.xml @@ -4,8 +4,7 @@ TeamWin TWRP - Default basic theme - preview.jpg + splash screen 1 diff --git a/gui/theme/landscape_mdpi/ui.xml b/gui/theme/landscape_mdpi/ui.xml index 3c4c7836..8b63dcbf 100644 --- a/gui/theme/landscape_mdpi/ui.xml +++ b/gui/theme/landscape_mdpi/ui.xml @@ -5,7 +5,7 @@ TeamWin Backup Naowz Default basic theme - preview.jpg + preview.png 1 diff --git a/gui/theme/portrait_hdpi/splash.xml b/gui/theme/portrait_hdpi/splash.xml index 964b2af9..02717e27 100755 --- a/gui/theme/portrait_hdpi/splash.xml +++ b/gui/theme/portrait_hdpi/splash.xml @@ -4,8 +4,7 @@ TeamWin TWRP - Default basic theme - preview.jpg + splash screen 1 diff --git a/gui/theme/portrait_hdpi/ui.xml b/gui/theme/portrait_hdpi/ui.xml index 18385ad2..5fc8cd20 100644 --- a/gui/theme/portrait_hdpi/ui.xml +++ b/gui/theme/portrait_hdpi/ui.xml @@ -5,7 +5,7 @@ TeamWin Backup Naowz Default basic theme - preview.jpg + preview.png 1 diff --git a/gui/theme/portrait_mdpi/splash.xml b/gui/theme/portrait_mdpi/splash.xml index 31f79338..dad53cce 100755 --- a/gui/theme/portrait_mdpi/splash.xml +++ b/gui/theme/portrait_mdpi/splash.xml @@ -4,8 +4,7 @@ TeamWin TWRP - Default basic theme - preview.jpg + splash screen 1 diff --git a/gui/theme/portrait_mdpi/ui.xml b/gui/theme/portrait_mdpi/ui.xml index 4d002ff5..5ac6b955 100644 --- a/gui/theme/portrait_mdpi/ui.xml +++ b/gui/theme/portrait_mdpi/ui.xml @@ -5,7 +5,7 @@ TeamWin Backup Naowz Default basic theme - preview.jpg + preview.png 1 diff --git a/gui/theme/watch_mdpi/splash.xml b/gui/theme/watch_mdpi/splash.xml index 81bef451..ff9bc985 100755 --- a/gui/theme/watch_mdpi/splash.xml +++ b/gui/theme/watch_mdpi/splash.xml @@ -4,8 +4,7 @@ TeamWin TWRP - Default basic theme - preview.jpg + splash screen 1 diff --git a/gui/theme/watch_mdpi/ui.xml b/gui/theme/watch_mdpi/ui.xml index bad23c02..c56610bf 100644 --- a/gui/theme/watch_mdpi/ui.xml +++ b/gui/theme/watch_mdpi/ui.xml @@ -6,7 +6,7 @@ TeamWin Backup Naowz Default basic theme - preview.jpg + preview.png 1 diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk index 39c61c40..ac4c181e 100644 --- a/minuitwrp/Android.mk +++ b/minuitwrp/Android.mk @@ -55,10 +55,11 @@ LOCAL_C_INCLUDES += \ external/libpng \ external/zlib \ system/core/include \ - external/jpeg \ external/freetype/include \ external/libcxx/include +#external/jpeg \ + ifeq ($(RECOVERY_TOUCHSCREEN_SWAP_XY), true) LOCAL_CFLAGS += -DRECOVERY_TOUCHSCREEN_SWAP_XY endif @@ -151,7 +152,8 @@ endif LOCAL_CLANG := true LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\" -LOCAL_SHARED_LIBRARIES += libft2 libz libc libcutils libjpeg libpng libutils +LOCAL_SHARED_LIBRARIES += libft2 libz libc libcutils libpng libutils +#libjpeg LOCAL_STATIC_LIBRARIES += libpixelflinger_twrp LOCAL_MODULE_TAGS := eng LOCAL_MODULE := libminuitwrp diff --git a/minuitwrp/resources.cpp b/minuitwrp/resources.cpp index 781df2b0..c4325e41 100644 --- a/minuitwrp/resources.cpp +++ b/minuitwrp/resources.cpp @@ -31,9 +31,11 @@ #include #include +#ifdef TW_INCLUDE_JPEG extern "C" { #include "jpeglib.h" } +#endif #include "minui.h" #define SURFACE_DATA_ALIGNMENT 8 @@ -251,6 +253,7 @@ int res_create_surface_png(const char* name, gr_surface* pSurface) { return result; } +#ifdef TW_INCLUDE_JPEG int res_create_surface_jpg(const char* name, gr_surface* pSurface) { GGLSurface* surface = NULL; int result = 0, y; @@ -348,18 +351,23 @@ exit: } return result; } +#endif int res_create_surface(const char* name, gr_surface* pSurface) { int ret; if (!name) return -1; +#ifdef TW_INCLUDE_JPEG if (strlen(name) > 4 && strcmp(name + strlen(name) - 4, ".jpg") == 0) return res_create_surface_jpg(name,pSurface); +#endif ret = res_create_surface_png(name,pSurface); +#ifdef TW_INCLUDE_JPEG if (ret < 0) ret = res_create_surface_jpg(name,pSurface); +#endif return ret; } diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 825b990e..e22883c8 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -122,7 +122,7 @@ 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 +#RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libjpeg.so ifeq ($(TWHAVE_SELINUX), true) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libselinux.so ifneq ($(TARGET_USERIMAGES_USE_EXT4), true)