diff options
| author | 2023-07-26 10:59:01 +0000 | |
|---|---|---|
| committer | 2023-07-26 10:59:01 +0000 | |
| commit | 164e9a9233fdaccd9e9ad86b0f00257c32e5d0c9 (patch) | |
| tree | 3879929322a1ce5af6a20bdd807680036b78f4e9 | |
| parent | 651ed13c79142f26648426a1f57032bce344f7a9 (diff) | |
| parent | 70bb42b6bd20ef0a6404709387d0f8c283cae8f4 (diff) | |
Merge "installd: add missing <functional> for std::function." into main am: a6ec7859db am: e3baf563c8 am: 33bcca6e4c am: 11867e366b am: 70bb42b6bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2673909
Change-Id: Ia5999a2369961ccea443b8abfa5238d92753f1ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cmds/installd/CrateManager.cpp | 3 | ||||
| -rw-r--r-- | cmds/installd/CrateManager.h | 1 | ||||
| -rw-r--r-- | cmds/installd/utils.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/cmds/installd/CrateManager.cpp b/cmds/installd/CrateManager.cpp index b17cba15d5..fd1df35aee 100644 --- a/cmds/installd/CrateManager.cpp +++ b/cmds/installd/CrateManager.cpp @@ -29,9 +29,10 @@ #include <sys/xattr.h> #include <unistd.h> +#include <utils.h> #include <fstream> +#include <functional> #include <string> -#include <utils.h> #include "utils.h" diff --git a/cmds/installd/CrateManager.h b/cmds/installd/CrateManager.h index 1f30b5dc79..d9b590f784 100644 --- a/cmds/installd/CrateManager.h +++ b/cmds/installd/CrateManager.h @@ -25,6 +25,7 @@ #include <sys/stat.h> #include <sys/types.h> +#include <functional> #include <optional> #include <string> #include <vector> diff --git a/cmds/installd/utils.h b/cmds/installd/utils.h index ecea1d2b1c..c43fdbd547 100644 --- a/cmds/installd/utils.h +++ b/cmds/installd/utils.h @@ -18,6 +18,7 @@ #ifndef UTILS_H_ #define UTILS_H_ +#include <functional> #include <string> #include <vector> |