diff options
| author | Elliott Hughes <enh@google.com> | 2017-05-13 00:34:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-13 00:34:10 +0000 |
| commit | f727d05b83a4f1a3059a126dbaa4058c25ad9180 (patch) | |
| tree | eca6328195f92d35a8981efaabb8c58f339e4075 | |
| parent | 10211d22078fbb6f29a21e0f86fc26bdb33b4a75 (diff) | |
| parent | 7a7df788198b532b6b827240d21c47eb902efd2d (diff) | |
| download | vold-f727d05b83a4f1a3059a126dbaa4058c25ad9180.tar.gz | |
Merge "Switch to libkeyutils." am: 612eea6b4f
am: 7a7df78819
Change-Id: I05f95589668e93b36d5d5eed2c4ac21aff6f7e41
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | Ext4Crypt.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -44,6 +44,7 @@ common_shared_libraries := \ libsysutils \ libbinder \ libcutils \ + libkeyutils \ liblog \ libdiskconfig \ libhardware_legacy \ diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp index 969ab0b7..fe1c796f 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> |