diff options
| author | 2024-08-15 17:21:40 +0000 | |
|---|---|---|
| committer | 2024-08-15 17:21:40 +0000 | |
| commit | 46a9bc7f69d623f757e598de6a21a089826a1fe4 (patch) | |
| tree | 762a41ab05d33aec3afcd8168fcb363685c69208 | |
| parent | d374d6870c4142cc1b7a924561ae6d6d61af8845 (diff) | |
| parent | 3e437ac64dde1adcaf5416762380555fe2abd522 (diff) | |
Merge "com_android_internal_os_Zygote.cpp: more #include cleanup." into main
| -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 5d8d73b63ad9..f1c1d928e43e 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> |