diff options
| author | 2024-08-15 17:45:13 +0000 | |
|---|---|---|
| committer | 2024-08-15 17:45:13 +0000 | |
| commit | 9e3ea36df6b581d2b49d2532fb1c8751256e0a89 (patch) | |
| tree | cdd94d56b7525a931c071a8bb5315df9697eab06 | |
| parent | 4e609566346bded56c95c248ffa131f9f241560a (diff) | |
| parent | 46a9bc7f69d623f757e598de6a21a089826a1fe4 (diff) | |
Merge "com_android_internal_os_Zygote.cpp: more #include cleanup." into main am: 46a9bc7f69
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3217418
Change-Id: I81e314034f0ceb21b60e929e8e4430156ee05d94
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> |