Merge "Switch to libkeyutils."

am: 612eea6b4f Change-Id: Icb86bc1c341ec9366f382985522b6ec70e11b8ea
2017-05-13 00:32:13 +00:00 · 2017-05-13 00:32:13 +00:00 · 7a7df78819
commit 7a7df78819
parent 7dc93304c8 612eea6b4f
2 changed files with 2 additions and 1 deletions
--- a/Android.mk
+++ b/Android.mk
@ -44,6 +44,7 @@ common_shared_libraries := \
 	libsysutils \
 	libbinder \
 	libcutils \
+	libkeyutils \
 	liblog \
 	libdiskconfig \
 	libhardware_legacy \
--- a/Ext4Crypt.cpp
+++ b/Ext4Crypt.cpp
@ -46,7 +46,7 @@

 #include <cutils/fs.h>
 #include <ext4_utils/ext4_crypt.h>
-#include <ext4_utils/key_control.h>
+#include <keyutils.h>

 #include <android-base/file.h>
 #include <android-base/logging.h>