Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f23739f authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "com_android_internal_os_Zygote.cpp: more #include cleanup." into main... 

Merge "com_android_internal_os_Zygote.cpp: more #include cleanup." into main am: 46a9bc7f am: 9e3ea36d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3217418



Change-Id: I9d63342fcab546372633f61533768ccc66549ab0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59e35b5e 9e3ea36d

core/jni/com_android_internal_os_Zygote.cpp

+3 −11
Original line number Diff line number Diff line
@@ -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>