From 930bf01caf3cbcabf97444b3071bcaff28597635 Mon Sep 17 00:00:00 2001
From: Dees_Troy <dees_troy@teamw.in>
Date: Sat, 10 Aug 2013 22:19:03 +0000
Subject: Remove libjpegtwrp and use CM provided libjpeg

---
 minuitwrp/Android.mk  | 9 +++++----
 minuitwrp/resources.c | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'minuitwrp')

diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk
index 0a760de9a..e1bf76ef1 100644
--- a/minuitwrp/Android.mk
+++ b/minuitwrp/Android.mk
@@ -13,7 +13,8 @@ endif
 LOCAL_C_INCLUDES += \
     external/libpng \
     external/zlib \
-    system/core/include
+    system/core/include \
+    external/jpeg
 
 LOCAL_C_INCLUDES += \
     bootable/recovery/libjpegtwrp
@@ -57,9 +58,9 @@ endif
 ifneq ($(BOARD_USE_CUSTOM_RECOVERY_FONT),)
   LOCAL_CFLAGS += -DBOARD_USE_CUSTOM_RECOVERY_FONT=$(BOARD_USE_CUSTOM_RECOVERY_FONT)
 endif
-LOCAL_SHARED_LIBRARIES += libz libc libcutils
-LOCAL_STATIC_LIBRARIES += libpng libjpegtwrp libpixelflinger_static
+LOCAL_SHARED_LIBRARIES += libz libc libcutils libjpeg
+LOCAL_STATIC_LIBRARIES += libpng libpixelflinger_static
 LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE := libminuitwrp
 
-include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
+include $(BUILD_SHARED_LIBRARY)
diff --git a/minuitwrp/resources.c b/minuitwrp/resources.c
index 4c8d8a93f..c589c9d8a 100644
--- a/minuitwrp/resources.c
+++ b/minuitwrp/resources.c
@@ -30,7 +30,7 @@
 #include <pixelflinger/pixelflinger.h>
 
 #include <png.h>
-#include "../libjpegtwrp/jpeglib.h"
+#include "jpeglib.h"
 
 #include "minui.h"
 
-- 
cgit v1.2.3