commit e0217d7b9ec71d18176b85f837c3d47a55ff9779
author Eric Biggers <ebiggers@google.com> Thu Jul 16 16:31:00 2020 -0700
committer Eric Biggers <ebiggers@google.com> Thu Jul 16 16:34:07 2020 -0700
tree 50808db5ea1eb4dc24a3b988f382af6de6c8d539
parent 2d9777bfbf4f85f28a4721779755603b31eb13b0

vold: drop local fscrypt UAPI definitions

Now that Bionic's copy of <linux/fscrypt.h> has been updated, there's no
need for vold to carry its own fscrypt_uapi.h.

Test: build
Change-Id: I61581ac74f7cf77bc8a835e64d96553a9d0c517a

KeyUtil.cpp

diff --git a/KeyUtil.cpp b/KeyUtil.cpp
index acc42db..948e799 100644
--- a/KeyUtil.cpp
+++ b/KeyUtil.cpp
@@ -30,7 +30,6 @@
 #include <android-base/properties.h>
 #include <keyutils.h>
 
-#include <fscrypt_uapi.h>
 #include "KeyStorage.h"
 #include "Utils.h"
 
@@ -245,7 +244,7 @@
 // https://www.kernel.org/doc/html/latest/filesystems/fscrypt.html#fs-ioc-add-encryption-key
 static bool installFsKeyringKey(const std::string& mountpoint, const EncryptionOptions& options,
                                 fscrypt_add_key_arg* arg) {
-    if (options.use_hw_wrapped_key) arg->flags |= FSCRYPT_ADD_KEY_FLAG_WRAPPED;
+    if (options.use_hw_wrapped_key) arg->__flags |= __FSCRYPT_ADD_KEY_FLAG_HW_WRAPPED;
 
     android::base::unique_fd fd(open(mountpoint.c_str(), O_RDONLY | O_DIRECTORY | O_CLOEXEC));
     if (fd == -1) {