Switch to libkeyutils.

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

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

diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp
index cb5f6d0..dd8922c 100644 (file)
--- 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>

diff --git a/KeyUtil.cpp b/KeyUtil.cpp
index fe0f3cb..865cc11 100644 (file)
--- 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"