commit 4e19ff7ab1dbf02316327b741db34f433d232b21
author Elliott Hughes <enh@google.com> Sat May 13 00:44:18 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat May 13 00:44:18 2017 +0000
tree 41ecd9323108231f1cbf98b5cd638df9ca503a46
parent 3559234cd3b4d09f38a96dd6fa98591d214021ca
parent f727d05b83a4f1a3059a126dbaa4058c25ad9180

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

Change-Id: I1b3e4e932e54b33dd582a849135822ace61c11d7

Android.mk

diff --git a/Android.mk b/Android.mk
index 06d98eb..45b3f62 100644
--- a/Android.mk
+++ b/Android.mk
@@ -42,6 +42,7 @@
 	libsysutils \
 	libbinder \
 	libcutils \
+	libkeyutils \
 	liblog \
 	libdiskconfig \
 	libhardware_legacy \

Ext4Crypt.cpp

diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp
index e40593e..f24d0d7 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>