diff options
| author | 2024-08-15 18:29:08 +0000 | |
|---|---|---|
| committer | 2024-08-15 18:29:08 +0000 | |
| commit | 7f23739ff50bc83c4b14f6d8fac01f563db549ed (patch) | |
| tree | 409823ea03ea2ac2250747e492b50a43772451ab | |
| parent | 59e35b5ec16db788ab4058c1c8871d1abdd2bc12 (diff) | |
| parent | 9e3ea36df6b581d2b49d2532fb1c8751256e0a89 (diff) | |
Merge "com_android_internal_os_Zygote.cpp: more #include cleanup." into main am: 46a9bc7f69 am: 9e3ea36df6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3217418
Change-Id: I9d63342fcab546372633f61533768ccc66549ab0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/jni/com_android_internal_os_Zygote.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 9112d376a32f..284c2997f9a9 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -19,14 +19,6 @@ #include "com_android_internal_os_Zygote.h" -#include <async_safe/log.h> - -// sys/mount.h has to come before linux/fs.h due to redefinition of MS_RDONLY, MS_BIND, etc -#include <sys/mount.h> -#include <linux/fs.h> -#include <sys/types.h> -#include <dirent.h> - #include <algorithm> #include <array> #include <atomic> @@ -41,19 +33,18 @@ #include <android/fdsan.h> #include <arpa/inet.h> +#include <dirent.h> #include <fcntl.h> #include <grp.h> #include <inttypes.h> #include <malloc.h> #include <mntent.h> -#include <paths.h> #include <signal.h> #include <stdio.h> #include <stdlib.h> -#include <sys/auxv.h> #include <sys/capability.h> -#include <sys/cdefs.h> #include <sys/eventfd.h> +#include <sys/mount.h> #include <sys/personality.h> #include <sys/prctl.h> #include <sys/resource.h> @@ -66,6 +57,7 @@ #include <sys/wait.h> #include <unistd.h> +#include <async_safe/log.h> #include <android-base/file.h> #include <android-base/logging.h> #include <android-base/properties.h> |