commit e08fd34dfe59cb224d63a3772714058af6e1c707
author Mark Salyzyn <salyzyn@google.com> Tue Mar 21 15:24:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 21 15:24:55 2017 +0000
tree 00dc9db63ca93a47c6dc00477f3bcf7d931a49ec
parent 2c1466526ae2e8d227b6cb9564a54de2ac056111
parent fd7361bf10669205c9b3aa26b6ae2bae1892787e

Merge "fs_mgr: remove private/android_filesystem_config.h" am: f5ee213a5c
am: ba9d88ebab

Change-Id: Ic9cd62b685dbc40f5e61bd8072cffba3cb2aff37

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 6c84d73..6636be2 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -45,8 +45,7 @@
 #include <linux/fs.h>
 #include <linux/loop.h>
 #include <logwrap/logwrap.h>
-#include <private/android_filesystem_config.h>
-#include <private/android_logger.h>
+#include <private/android_logger.h>  // for __android_log_is_debuggable()
 
 #include "fs_mgr_priv.h"
 #include "fs_mgr_priv_avb.h"

fs_mgr/fs_mgr_verity.cpp

diff --git a/fs_mgr/fs_mgr_verity.cpp b/fs_mgr/fs_mgr_verity.cpp
index 54a6f71..8c7a8ca 100644
--- a/fs_mgr/fs_mgr_verity.cpp
+++ b/fs_mgr/fs_mgr_verity.cpp
@@ -39,7 +39,6 @@
 #include <openssl/obj_mac.h>
 #include <openssl/rsa.h>
 #include <openssl/sha.h>
-#include <private/android_filesystem_config.h>
 
 #include "fec/io.h"