diff options
| author | 2024-01-10 02:18:31 +0000 | |
|---|---|---|
| committer | 2024-01-10 02:18:31 +0000 | |
| commit | 981c23b9cebfce9860337adf34468e541dbb942c (patch) | |
| tree | 15cf4aef8164afb988422290ad4cd81e6cba2786 | |
| parent | 995ca12f36b9f135884333b75d2c439e9bd611bc (diff) | |
| parent | e62df66f769e378823c624a87a10b21deb5fb241 (diff) | |
Merge "Add missing libc++ includes" into main am: f1527d5124 am: 3b8e44d662 am: e62df66f76
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2902448
Change-Id: Ib0b3ad86aba893783b2ba251ab044acc306302b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/UtilsHost.h | 1 | ||||
| -rw-r--r-- | libs/binder/tests/format.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libs/binder/UtilsHost.h b/libs/binder/UtilsHost.h index b582f17c1a..d6fe9facde 100644 --- a/libs/binder/UtilsHost.h +++ b/libs/binder/UtilsHost.h @@ -16,6 +16,7 @@ #pragma once +#include <functional> #include <optional> #include <ostream> #include <string> diff --git a/libs/binder/tests/format.h b/libs/binder/tests/format.h index b5440a43e4..c588de70bd 100644 --- a/libs/binder/tests/format.h +++ b/libs/binder/tests/format.h @@ -18,7 +18,7 @@ // ETA for this blocker is 2023-10-27~2023-11-10. // Also, remember to remove fmtlib's format.cc from trusty makefiles. -#if __has_include(<format>) +#if __has_include(<format>) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT) #include <format> #else #include <fmt/format.h> |