| commit | 3b8e44d662f7a9fa9e1ffe76c0d42575d68293b9 | [log] [tgz] |
|---|---|---|
| author | Tomasz Wasilczyk <twasilczyk@google.com> | Wed Jan 10 01:14:55 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 10 01:14:55 2024 +0000 |
| tree | 101bdb677acebfd803732f3903e87a10938c2efc | |
| parent | d375c5eddc492d4cffbbb2db8e2aba2da7ddec72 [diff] | |
| parent | f1527d512413318146ca57c2378f86a3fb587d09 [diff] |
Merge "Add missing libc++ includes" into main am: f1527d5124 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2902448 Change-Id: I3e3c9468184842842aaf16299527a2b72c69aa6e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/UtilsHost.h b/libs/binder/UtilsHost.h index b582f17..d6fe9fa 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 b5440a4..c588de7 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>