Merge "Switch to libkeyutils."
This commit is contained in:
commit
612eea6b4f
2 changed files with 2 additions and 1 deletions
|
@ -44,6 +44,7 @@ common_shared_libraries := \
|
||||||
libsysutils \
|
libsysutils \
|
||||||
libbinder \
|
libbinder \
|
||||||
libcutils \
|
libcutils \
|
||||||
|
libkeyutils \
|
||||||
liblog \
|
liblog \
|
||||||
libdiskconfig \
|
libdiskconfig \
|
||||||
libhardware_legacy \
|
libhardware_legacy \
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
|
|
||||||
#include <cutils/fs.h>
|
#include <cutils/fs.h>
|
||||||
#include <ext4_utils/ext4_crypt.h>
|
#include <ext4_utils/ext4_crypt.h>
|
||||||
#include <ext4_utils/key_control.h>
|
#include <keyutils.h>
|
||||||
|
|
||||||
#include <android-base/file.h>
|
#include <android-base/file.h>
|
||||||
#include <android-base/logging.h>
|
#include <android-base/logging.h>
|
||||||
|
|
Loading…
Reference in a new issue