commit 73be12dcd50069dccc76b7bd2d72d70258f420df
author Paul Crowley <paulcrowley@google.com> Mon Feb 03 12:22:03 2020 -0800
committer Paul Crowley <paulcrowley@google.com> Fri Feb 07 11:16:12 2020 -0800
tree 505a698fbc22fc2b7fb7f67a498f028e0b8394a0
parent f60e94743881875e21ec9c9a496b3bc1a71e2f03

Refactor: make cryptfs.h smaller

Move most of it into cryptfs.cpp, and include cryptfs.h in fewer files.

Bug: 147814592
Test: Treehugger
Change-Id: Ia3592d73e7abc1f07a60538e0978a3033bdea7de

VoldNativeService.cpp

diff --git a/VoldNativeService.cpp b/VoldNativeService.cpp
index 6af34d9..905407b 100644
--- a/VoldNativeService.cpp
+++ b/VoldNativeService.cpp
@@ -17,17 +17,19 @@
 #define ATRACE_TAG ATRACE_TAG_PACKAGE_MANAGER
 
 #include "VoldNativeService.h"
+
 #include "Benchmark.h"
 #include "CheckEncryption.h"
-#include "IdleMaint.h"
-#include "MoveStorage.h"
-#include "Process.h"
-#include "VolumeManager.h"
-
 #include "Checkpoint.h"
 #include "FsCrypt.h"
+#include "IdleMaint.h"
 #include "MetadataCrypt.h"
+#include "MoveStorage.h"
+#include "Process.h"
+#include "VoldUtil.h"
+#include "VolumeManager.h"
 #include "cryptfs.h"
+
 #include "incfs_ndk.h"
 
 #include <fstream>