From 06b91e7965bc3451ecc27886efc3df4c35f197f4 Mon Sep 17 00:00:00 2001
From: OliverG96 <oliverarafo@gmail.com>
Date: Fri, 6 Dec 2013 00:10:56 +0000
Subject: crypto: Fix crypto dependencies for ICS/Samsung methods

- libmincrypt renamed to libmincrypttwrp that is an static library
- libjpegtwrp does not exist
- libfs_mgrtwrp is for JB decryption methods

This fixes making full builds when TW_INCLUDE_CRYPTO_SAMSUNG := true and TW_INCLUDE_CRYPTO := true are set.
Somehow typing make recoveryimage doesnt push the mentioned issue.

Change-Id: I7cad5db4f51152a1a8209e619b188ca88d7c74d1
---
 crypto/cryptfs/Android.mk            | 8 ++++----
 crypto/cryptsettings/Android.mk      | 5 ++++-
 crypto/cryptsettings/cryptsettings.c | 4 ++++
 crypto/fs_mgr/Android.mk             | 4 ++--
 minuitwrp/Android.mk                 | 3 ---
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/crypto/cryptfs/Android.mk b/crypto/cryptfs/Android.mk
index 62713fed7..f0388c228 100644
--- a/crypto/cryptfs/Android.mk
+++ b/crypto/cryptfs/Android.mk
@@ -40,9 +40,9 @@ LOCAL_SHARED_LIBRARIES += libcrypto
 LOCAL_LDFLAGS += -ldl
 
 LOCAL_STATIC_LIBRARIES += libmtdutils
-LOCAL_STATIC_LIBRARIES += libminadbd libminzip libunz
-LOCAL_STATIC_LIBRARIES += libminuitwrp libpixelflinger_static libpng libjpegtwrp libgui
-LOCAL_SHARED_LIBRARIES += libz libc libstlport libcutils libstdc++ libmincrypt libext4_utils
+LOCAL_STATIC_LIBRARIES += libminzip libunz
+LOCAL_STATIC_LIBRARIES += libpixelflinger_static libpng libmincrypttwrp
+LOCAL_SHARED_LIBRARIES += libz libc libstlport libcutils libstdc++ libext4_utils
 LOCAL_STATIC_LIBRARIES += libcrypt_samsung
 
 
@@ -51,4 +51,4 @@ LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UI_LIB)
 LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES
 LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities
 include $(BUILD_EXECUTABLE)
-endif
\ No newline at end of file
+endif
diff --git a/crypto/cryptsettings/Android.mk b/crypto/cryptsettings/Android.mk
index 73b6b4a8b..3a5704891 100644
--- a/crypto/cryptsettings/Android.mk
+++ b/crypto/cryptsettings/Android.mk
@@ -7,8 +7,11 @@ LOCAL_CFLAGS:= -g -c -W
 LOCAL_MODULE:=cryptsettings
 LOCAL_MODULE_TAGS:= eng
 LOCAL_SHARED_LIBRARIES += libc libcutils
+ifeq ($(TW_INCLUDE_JB_CRYPTO), true)
+LOCAL_CFLAGS += -DTW_INCLUDE_JB_CRYPTO
 LOCAL_STATIC_LIBRARIES += libfs_mgrtwrp
+endif
 LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES
 LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities
 include $(BUILD_EXECUTABLE)
-endif
\ No newline at end of file
+endif
diff --git a/crypto/cryptsettings/cryptsettings.c b/crypto/cryptsettings/cryptsettings.c
index 79fad7198..4fa2b9354 100644
--- a/crypto/cryptsettings/cryptsettings.c
+++ b/crypto/cryptsettings/cryptsettings.c
@@ -5,7 +5,9 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#ifdef TW_INCLUDE_JB_CRYPTO
 #include "../crypto/fs_mgr/include/fs_mgr.h"
+#endif
 
 #include "cutils/properties.h"
 
@@ -41,11 +43,13 @@ int main(void)
 	printf("TW_CRYPTO_FS_FLAGS := \"%s\"\n", prop);
 	property_get("ro.crypto.keyfile.userdata", prop, "footer");
 	printf("TW_CRYPTO_KEY_LOC := \"%s\"\n", prop);
+#ifdef TW_INCLUDE_JB_CRYPTO
 	printf("\n*** NEW FOR JELLY BEAN:\n");
 	strcpy(fstab_filename, FSTAB_PREFIX);
 	property_get("ro.hardware", fstab_filename + sizeof(FSTAB_PREFIX) - 1, "");
 	fs_mgr_get_crypt_info(fstab_filename, key_loc, blk_dev, sizeof(key_loc));
 	printf("fstab file location: '%s'\n\nTW_INCLUDE_JB_CRYPTO := true\n", fstab_filename);
+#endif
 
 	return 0;
 }
diff --git a/crypto/fs_mgr/Android.mk b/crypto/fs_mgr/Android.mk
index f638e98c2..4196710af 100644
--- a/crypto/fs_mgr/Android.mk
+++ b/crypto/fs_mgr/Android.mk
@@ -1,5 +1,5 @@
 # Copyright 2011 The Android Open Source Project
-
+ifeq ($(TW_INCLUDE_JB_CRYPTO), true)
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -16,7 +16,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 include $(BUILD_STATIC_LIBRARY)
 
 
-
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= fs_mgr_main.c
@@ -34,3 +33,4 @@ LOCAL_STATIC_LIBRARIES := libfs_mgrtwrp liblogwraptwrp libcutils liblog libc lib
 
 include $(BUILD_EXECUTABLE)
 
+endif
diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk
index e1bf76ef1..6e5f45f0b 100644
--- a/minuitwrp/Android.mk
+++ b/minuitwrp/Android.mk
@@ -16,9 +16,6 @@ LOCAL_C_INCLUDES += \
     system/core/include \
     external/jpeg
 
-LOCAL_C_INCLUDES += \
-    bootable/recovery/libjpegtwrp
-
 ifeq ($(RECOVERY_TOUCHSCREEN_SWAP_XY), true)
 LOCAL_CFLAGS += -DRECOVERY_TOUCHSCREEN_SWAP_XY
 endif
-- 
cgit v1.2.3