commit f71ace310eec3e39f0efefd51f62c9ccf4180f48
author Paul Crowley <paulcrowley@google.com> Thu Jun 02 11:01:19 2016 -0700
committer Paul Lawrence <paullawrence@google.com> Fri Apr 21 10:47:17 2017 -0700
tree 85b507c67ffc3527a069f98065f50e471c73bbc6
parent 5e32f9c8fc6afdaa9e016e0048ab22bfdffdce77

Refactor to lay the groundwork for metadata encryption

Bug: 26778031
Test: Angler, Marlin build and boot
Change-Id: Ic136dfe6195a650f7db76d3489f36da6a1929dc5

Android.mk

diff --git a/Android.mk b/Android.mk
index 8a1ffa0..ca0a21b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -29,12 +29,15 @@
 	TrimTask.cpp \
 	Keymaster.cpp \
 	KeyStorage.cpp \
+	KeyUtil.cpp \
 	ScryptParameters.cpp \
 	secontext.cpp \
+	EncryptInplace.cpp \
 
 common_c_includes := \
 	system/extras/f2fs_utils \
 	external/scrypt/lib/crypto \
+	external/f2fs-tools/include \
 	frameworks/native/include \
 	system/security/keystore \