| commit | 11867e366b1c69883df656932388a3f321caff08 | [log] [tgz] |
|---|---|---|
| author | Ryan Prichard <rprichard@google.com> | Wed Jul 26 08:50:17 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 26 08:50:17 2023 +0000 |
| tree | 2d168c338ab5ddf06bf9128281284f64023f90d9 | |
| parent | 8548e36faaa67480890a82f1c945c8fbe0cc27ab [diff] | |
| parent | 33bcca6e4c9169a63dd86c69e9546be4f79320a8 [diff] |
Merge "installd: add missing <functional> for std::function." into main am: a6ec7859db am: e3baf563c8 am: 33bcca6e4c Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2673909 Change-Id: I36f9a8a4000301ca2e96f685e9eeb9774b5ac42a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cmds/installd/CrateManager.cpp b/cmds/installd/CrateManager.cpp index b17cba1..fd1df35 100644 --- a/cmds/installd/CrateManager.cpp +++ b/cmds/installd/CrateManager.cpp
@@ -29,9 +29,10 @@ #include <sys/xattr.h> #include <unistd.h> -#include <fstream> -#include <string> #include <utils.h> +#include <fstream> +#include <functional> +#include <string> #include "utils.h"
diff --git a/cmds/installd/CrateManager.h b/cmds/installd/CrateManager.h index 1f30b5d..d9b590f 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 ecea1d2..c43fdbd 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>