summaryrefslogtreecommitdiffstats
path: root/partitionmanager.cpp
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2014-11-11 21:52:28 +0100
committerDees Troy <dees_troy@teamw.in>2014-11-12 18:07:24 +0100
commit4eca40d7d8ff6968ed68a24686093cfb6f5f6373 (patch)
tree39a211a1f021a98d7ee2c57d939891dccbc96048 /partitionmanager.cpp
parentMake TWRP compile for arm64 (diff)
downloadandroid_bootable_recovery-4eca40d7d8ff6968ed68a24686093cfb6f5f6373.tar
android_bootable_recovery-4eca40d7d8ff6968ed68a24686093cfb6f5f6373.tar.gz
android_bootable_recovery-4eca40d7d8ff6968ed68a24686093cfb6f5f6373.tar.bz2
android_bootable_recovery-4eca40d7d8ff6968ed68a24686093cfb6f5f6373.tar.lz
android_bootable_recovery-4eca40d7d8ff6968ed68a24686093cfb6f5f6373.tar.xz
android_bootable_recovery-4eca40d7d8ff6968ed68a24686093cfb6f5f6373.tar.zst
android_bootable_recovery-4eca40d7d8ff6968ed68a24686093cfb6f5f6373.zip
Diffstat (limited to '')
-rw-r--r--partitionmanager.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 96266a3e8..d2c91be7a 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -51,6 +51,8 @@ extern "C" {
#ifdef TW_INCLUDE_CRYPTO
#ifdef TW_INCLUDE_JB_CRYPTO
#include "crypto/jb/cryptfs.h"
+ #elif defined(TW_INCLUDE_L_CRYPTO)
+ #include "crypto/lollipop/cryptfs.h"
#else
#include "crypto/ics/cryptfs.h"
#endif
@@ -1334,7 +1336,7 @@ int TWPartitionManager::Decrypt_Device(string Password) {
size_t result;
property_set("ro.crypto.state", "encrypted");
-#ifdef TW_INCLUDE_JB_CRYPTO
+#if defined(TW_INCLUDE_JB_CRYPTO) || defined(TW_INCLUDE_L_CRYPTO)
// No extra flags needed
#else
property_set("ro.crypto.fs_type", CRYPTO_FS_TYPE);