commit 612eea6b4f9ed1ec5fb1b14758ebd36bfd3adc53
author Elliott Hughes <enh@google.com> Sat May 13 00:28:25 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat May 13 00:28:27 2017 +0000
tree eca6328195f92d35a8981efaabb8c58f339e4075
parent fed8ab1d7641a0c410bda6b2dd3fad64edd85f40
parent 12d1312f983a1de93a9a8a79d8153cfa292e4504

Merge "Switch to libkeyutils."

Android.mk

diff --git a/Android.mk b/Android.mk
index d183a17..17cf843 100644
--- a/Android.mk
+++ b/Android.mk
@@ -44,6 +44,7 @@
 	libsysutils \
 	libbinder \
 	libcutils \
+	libkeyutils \
 	liblog \
 	libdiskconfig \
 	libhardware_legacy \

Ext4Crypt.cpp

diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp
index 969ab0b..fe1c796 100644
--- 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>