diff options
| author | Dees_Troy <dees_troy@teamw.in> | 2013-08-11 15:32:44 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@198.50.184.117> | 2013-08-11 15:32:44 +0200 |
| commit | bdafe306fa80312e25491f092000a5bb79dc1617 (patch) | |
| tree | a5fc3523fa892adba7db8432524278da6dc349a2 /minui | |
| parent | Merge "Rename libfuse to prevent conflicts with newer CM trees" into twrp2.5 (diff) | |
| parent | Remove libjpegtwrp and use CM provided libjpeg (diff) | |
| download | android_bootable_recovery-bdafe306fa80312e25491f092000a5bb79dc1617.tar android_bootable_recovery-bdafe306fa80312e25491f092000a5bb79dc1617.tar.gz android_bootable_recovery-bdafe306fa80312e25491f092000a5bb79dc1617.tar.bz2 android_bootable_recovery-bdafe306fa80312e25491f092000a5bb79dc1617.tar.lz android_bootable_recovery-bdafe306fa80312e25491f092000a5bb79dc1617.tar.xz android_bootable_recovery-bdafe306fa80312e25491f092000a5bb79dc1617.tar.zst android_bootable_recovery-bdafe306fa80312e25491f092000a5bb79dc1617.zip | |
Diffstat (limited to '')
| -rw-r--r-- | minuitwrp/Android.mk | 9 | ||||
| -rw-r--r-- | minuitwrp/resources.c | 2 |
2 files changed, 6 insertions, 5 deletions
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" |