summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2025-03-06 06:13:44 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-06 06:13:44 -0800
commit76f6fa354570180c6b1498a525f7fae5196e7d22 (patch)
tree31e9b752426a301d5b868d99d58d8b971216cc82
parent9eca8465c131482035ca284d0c3fdcb785eb91a8 (diff)
parent6b89e9cebbb84cf5eb2ce34f943e513bb9b2ba08 (diff)
Fix C++23 build. am: 6ffde7f20f am: 6b89e9cebb
Original change: https://android-review.googlesource.com/c/platform/art/+/3524394 Change-Id: I4f39b2f3b38360b29411e2576205d6f727c9bae2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libartbase/base/os.h4
-rw-r--r--runtime/trace.h5
2 files changed, 2 insertions, 7 deletions
diff --git a/libartbase/base/os.h b/libartbase/base/os.h
index 7880937949..a10455d051 100644
--- a/libartbase/base/os.h
+++ b/libartbase/base/os.h
@@ -24,9 +24,7 @@
#include <memory>
#include <string>
-namespace unix_file {
-class FdFile;
-} // namespace unix_file
+#include "unix_file/fd_file.h"
namespace art {
diff --git a/runtime/trace.h b/runtime/trace.h
index 952c996d63..ca728e93f9 100644
--- a/runtime/trace.h
+++ b/runtime/trace.h
@@ -32,15 +32,12 @@
#include "base/mutex.h"
#include "base/os.h"
#include "base/safe_map.h"
+#include "base/unix_file/fd_file.h"
#include "class_linker.h"
#include "instrumentation.h"
#include "runtime_globals.h"
#include "thread_pool.h"
-namespace unix_file {
-class FdFile;
-} // namespace unix_file
-
namespace art HIDDEN {
class ArtField;