diff --git a/crypto/cryptfs/Android.mk b/crypto/cryptfs/Android.mk
index 3267c931..62713fed 100644
--- a/crypto/cryptfs/Android.mk
+++ b/crypto/cryptfs/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
-
+ifeq ($(TW_INCLUDE_CRYPTO), true)
 LOCAL_SRC_FILES:= \
 	cryptfs.c
 
@@ -51,3 +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
diff --git a/crypto/cryptsettings/Android.mk b/crypto/cryptsettings/Android.mk
index 9e7aa5f3..73b6b4a8 100644
--- a/crypto/cryptsettings/Android.mk
+++ b/crypto/cryptsettings/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
-
+ifeq ($(TW_INCLUDE_CRYPTO), true)
 LOCAL_SRC_FILES:= \
 	cryptsettings.c
 LOCAL_CFLAGS:= -g -c -W
@@ -11,3 +11,4 @@ LOCAL_STATIC_LIBRARIES += libfs_mgrtwrp
 LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES
 LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities
 include $(BUILD_EXECUTABLE)
+endif
\ No newline at end of file
diff --git a/crypto/fs_mgr/Android.mk b/crypto/fs_mgr/Android.mk
index 8834282e..b2a341f3 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)
 
@@ -31,3 +31,4 @@ include $(BUILD_STATIC_LIBRARY)
 
 #include $(BUILD_EXECUTABLE)
 
+endif
diff --git a/crypto/ics/Android.mk b/crypto/ics/Android.mk
index 4529ae5c..fb8449db 100644
--- a/crypto/ics/Android.mk
+++ b/crypto/ics/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-
+ifeq ($(TW_INCLUDE_CRYPTO), true)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libcryptfsics
@@ -23,3 +23,4 @@ LOCAL_C_INCLUDES += system/extras/ext4_utils external/openssl/include
 LOCAL_SHARED_LIBRARIES += libc liblog libcutils libcrypto
 
 include $(BUILD_SHARED_LIBRARY)
+endif
diff --git a/crypto/jb/Android.mk b/crypto/jb/Android.mk
index 87eb055a..eebfcf0b 100644
--- a/crypto/jb/Android.mk
+++ b/crypto/jb/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-
+ifeq ($(TW_INCLUDE_JB_CRYPTO), true)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libcryptfsjb
@@ -11,4 +11,5 @@ LOCAL_C_INCLUDES += system/extras/ext4_utils external/openssl/include
 LOCAL_SHARED_LIBRARIES += libc liblog libcutils libcrypto
 LOCAL_STATIC_LIBRARIES += libfs_mgrtwrp
 
-include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
+include $(BUILD_SHARED_LIBRARY)
+endif
\ No newline at end of file