aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLev Rumyantsev <levarum@google.com>2024-04-18 21:37:21 -0700
committerLev Rumyantsev <levarum@google.com>2024-04-24 21:26:46 -0700
commit5fe6d56ce2ad491251912db30c958ab39d75aa70 (patch)
treea94847a993caefafcc3f2aec547227479e107a06
parent219fd07374d5290d54c3ef79ae5338171b24aafa (diff)
downloadbinary_translation-5fe6d56ce2ad491251912db30c958ab39d75aa70.tar.gz
base: export fd.h
We'll need it for /proc/self/maps emulation Test: tree-hugger Bug: 322873334 Change-Id: I7e721395d9b6b32ef8804e270ff896b97eb898e3 Merged-In: I7e721395d9b6b32ef8804e270ff896b97eb898e3
-rw-r--r--base/exec_region_anonymous.cc2
-rw-r--r--base/exec_region_elf_backed.cc3
-rw-r--r--base/include/berberis/base/fd.h (renamed from base/fd.h)0
-rw-r--r--base/memfd_backed_mmap.cc3
4 files changed, 3 insertions, 5 deletions
diff --git a/base/exec_region_anonymous.cc b/base/exec_region_anonymous.cc
index b9a1f936..196a14be 100644
--- a/base/exec_region_anonymous.cc
+++ b/base/exec_region_anonymous.cc
@@ -18,8 +18,8 @@
#include <sys/mman.h>
+#include "berberis/base/fd.h"
#include "berberis/base/mmap.h"
-#include "fd.h"
namespace berberis {
diff --git a/base/exec_region_elf_backed.cc b/base/exec_region_elf_backed.cc
index 0d67de1e..440449e3 100644
--- a/base/exec_region_elf_backed.cc
+++ b/base/exec_region_elf_backed.cc
@@ -21,10 +21,9 @@
#include <sys/mman.h>
#include "berberis/base/bit_util.h"
+#include "berberis/base/fd.h"
#include "berberis/base/mmap.h"
-#include "fd.h"
-
// Note that we have to use absolute path for ANDROID_DLEXT_FORCE_LOAD to work correctly
// otherwise searching by soname will trigger and the flag will have no effect.
#if defined(__LP64__)
diff --git a/base/fd.h b/base/include/berberis/base/fd.h
index 27af9d6f..27af9d6f 100644
--- a/base/fd.h
+++ b/base/include/berberis/base/fd.h
diff --git a/base/memfd_backed_mmap.cc b/base/memfd_backed_mmap.cc
index 694f6cba..6f5a44b9 100644
--- a/base/memfd_backed_mmap.cc
+++ b/base/memfd_backed_mmap.cc
@@ -19,12 +19,11 @@
#include <sys/mman.h>
#include <unistd.h>
+#include "berberis/base/fd.h"
#include "berberis/base/large_mmap.h"
#include "berberis/base/logging.h"
#include "berberis/base/mmap.h"
-#include "fd.h"
-
namespace berberis {
// Creates memfd region of memfd_file_size bytes filled with value.