diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-08-26 23:24:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-08-26 23:24:54 +0000 |
| commit | e3cd3badbd4de06a9931ef94a315d704720b5fec (patch) | |
| tree | ac033d58c47ba5dfe4d444aeb9573225c895e597 /init/builtins.cpp | |
| parent | 7a0948f6c4fb98dc26d0d34043c0ab19a6d3f0b1 (diff) | |
| parent | 052f31c678bd4ec27d3eb4cc89b0e0f1d2fa97e6 (diff) | |
Merge "Move fscrypt_init_extensions into system/core"
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index e17e8993c..ed240267b 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -55,7 +55,6 @@ #include <cutils/android_reboot.h> #include <fs_mgr.h> #include <fscrypt/fscrypt.h> -#include <fscrypt/fscrypt_init_extensions.h> #include <libgsi/libgsi.h> #include <selinux/android.h> #include <selinux/label.h> @@ -64,6 +63,7 @@ #include "action_manager.h" #include "bootchart.h" +#include "fscrypt_init_extensions.h" #include "init.h" #include "mount_namespace.h" #include "parser.h" |