commit c3bda18bda525ff8d43be0d38747350f7991e247
author Elliott Hughes <enh@google.com> Tue May 09 17:01:04 2017 -0700
committer Elliott Hughes <enh@google.com> Wed May 10 16:59:33 2017 -0700
tree ffdae6a11717a228ee635e948ccddf4e86e1b36b
parent 805defa9b452b1512b7c859006076a61a78f3fc5

Switch to libkeyutils.

Bug: http://b/37991155
Test: builds+boots
Change-Id: I33a3ba0d59ffd504093dc94517815c1196e95e2b

Android.mk

diff --git a/Android.mk b/Android.mk
index 69be87d..e92955f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,6 +46,7 @@
 	libsysutils \
 	libbinder \
 	libcutils \
+	libkeyutils \
 	liblog \
 	libdiskconfig \
 	libhardware_legacy \

Ext4Crypt.cpp

diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp
index cb5f6d0..dd8922c 100644
--- a/Ext4Crypt.cpp
+++ b/Ext4Crypt.cpp
@@ -46,8 +46,8 @@
 #include <cutils/fs.h>
 #include <cutils/properties.h>
 
-#include <ext4_utils/key_control.h>
 #include <ext4_utils/ext4_crypt.h>
+#include <keyutils.h>
 
 #include <android-base/file.h>
 #include <android-base/logging.h>

KeyUtil.cpp

diff --git a/KeyUtil.cpp b/KeyUtil.cpp
index fe0f3cb..865cc11 100644
--- a/KeyUtil.cpp
+++ b/KeyUtil.cpp
@@ -20,12 +20,11 @@
 #include <sstream>
 #include <string>
 
-#include <ext4_utils/key_control.h>
-
 #include <openssl/sha.h>
 
 #include <android-base/file.h>
 #include <android-base/logging.h>
+#include <keyutils.h>
 
 #include "KeyStorage.h"
 #include "Utils.h"