Merge "Switch to libkeyutils." am: 612eea6b4f am: 7a7df78819

am: f727d05b83 Change-Id: I1b3e4e932e54b33dd582a849135822ace61c11d7
7 years ago · 4e19ff7ab1
parent 3559234cd3 f727d05b83
commit 4e19ff7ab1
2 changed files with 2 additions and 1 deletions
--- a/Android.mk
+++ b/Android.mk
@ -42,6 +42,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>