Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b8e44d6 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Add missing libc++ includes" into main am: f1527d51 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2902448



Change-Id: I3e3c9468184842842aaf16299527a2b72c69aa6e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d375c5ed f1527d51

libs/binder/UtilsHost.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#pragma once



#include <functional>

#include <optional>

#include <ostream>

#include <string>

libs/binder/tests/format.h

+1 −1
Original line number Diff line number Diff line
@@ -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>