Merge "Switch to libkeyutils."

7 years ago · 612eea6b4f
parent fed8ab1d76 12d1312f98
commit 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>