commit a957f078be58639bd4c4ba1f36e5cf2745420342
author bigbiff <bigbiff@teamw.in> Sun Mar 07 18:20:29 2021 -0500
committer bigbiff <bigbiff@teamw.in> Tue May 18 20:35:51 2021 -0400
tree f33be4123f41b01697bdeebea823d20641cb2893
parent 9c1709b9639fe826a311ad93a71e983d92308559

FsCrypt update: support fscrypt policies v1 and v2

This patchset introduces support decryption for Android 11.

In this update we deprecate ext4crypt. To specify the
policy version to use, use TW_USE_FSCRYPT_POLICY := 1 or
TW_USE_FSCRYPT_POLICY := 2. By default policy version will
be set to 2 if this variable is omitted.

Change-Id: I62a29c1bef36c259ec4b11259f71be613d20a112

crypto/fscrypt/VoldUtil.h

diff --git a/crypto/fscrypt/VoldUtil.h b/crypto/fscrypt/VoldUtil.h
index 173c598..ce6b411 100644
--- a/crypto/fscrypt/VoldUtil.h
+++ b/crypto/fscrypt/VoldUtil.h
@@ -17,8 +17,7 @@
 #pragma once
 
 #include <fstab/fstab.h>
-#include <sys/cdefs.h>
 
 extern android::fs_mgr::Fstab fstab_default;
 
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
+#define DATA_MNT_POINT "/data"