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

Commit d93ffe72 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "init: more header cleanup" am: ab5ab1eb 

am: 6510908b

Change-Id: I4652593443b18e91914eda674276ad4b37f96eb9
parents b00ea152 6510908b

init/action.cpp

+1 −6
Original line number Diff line number Diff line
@@ -16,16 +16,11 @@ 


#include "action.h"



#include <errno.h>



#include <android-base/logging.h>

#include <android-base/properties.h>

#include <android-base/stringprintf.h>

#include <android-base/strings.h>



#include "builtins.h"

#include "error.h"

#include "init_parser.h"

#include "log.h"

#include "util.h"



using android::base::Join;

init/bootchart.cpp

+0 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "bootchart.h"



#include <dirent.h>

#include <errno.h>

#include <fcntl.h>

#include <stdio.h>

#include <stdlib.h>
@@ -31,9 +30,7 @@ 
#include <condition_variable>

#include <memory>

#include <mutex>

#include <string>

#include <thread>

#include <vector>



#include <android-base/file.h>

#include <android-base/logging.h>

init/builtins.cpp

+9 −15
Original line number Diff line number Diff line
@@ -19,33 +19,27 @@ 
#include <dirent.h>

#include <errno.h>

#include <fcntl.h>

#include <linux/loop.h>

#include <linux/module.h>

#include <mntent.h>

#include <net/if.h>

#include <signal.h>

#include <sched.h>

#include <signal.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <sys/socket.h>

#include <sys/mount.h>

#include <sys/resource.h>

#include <sys/socket.h>

#include <sys/stat.h>

#include <sys/syscall.h>

#include <sys/time.h>

#include <sys/types.h>

#include <sys/stat.h>

#include <sys/wait.h>

#include <unistd.h>

#include <linux/loop.h>

#include <linux/module.h>



#include <string>

#include <thread>



#include <selinux/android.h>

#include <selinux/selinux.h>

#include <selinux/label.h>



#include <android-base/file.h>

#include <android-base/logging.h>

#include <android-base/parseint.h>

#include <android-base/properties.h>

#include <android-base/stringprintf.h>
@@ -55,14 +49,14 @@ 
#include <ext4_utils/ext4_crypt.h>

#include <ext4_utils/ext4_crypt_init_extensions.h>

#include <fs_mgr.h>

#include <logwrap/logwrap.h>

#include <selinux/android.h>

#include <selinux/label.h>

#include <selinux/selinux.h>



#include "action.h"

#include "bootchart.h"

#include "devices.h"

#include "init.h"

#include "init_parser.h"

#include "log.h"

#include "property_service.h"

#include "reboot.h"

#include "service.h"

init/descriptors.cpp

+1 −2
Original line number Diff line number Diff line
@@ -19,16 +19,15 @@ 
#include <ctype.h>

#include <fcntl.h>

#include <sys/stat.h>

#include <sys/types.h>

#include <unistd.h>



#include <android-base/logging.h>

#include <android-base/stringprintf.h>

#include <android-base/unique_fd.h>

#include <cutils/android_get_control_file.h>

#include <cutils/sockets.h>



#include "init.h"

#include "log.h"

#include "util.h"



DescriptorInfo::DescriptorInfo(const std::string& name, const std::string& type, uid_t uid,

init/devices.cpp

+7 −11
Original line number Diff line number Diff line
@@ -19,41 +19,37 @@ 
#include <fcntl.h>

#include <fnmatch.h>

#include <libgen.h>

#include <linux/netlink.h>

#include <stddef.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <sys/sendfile.h>

#include <sys/socket.h>

#include <sys/stat.h>

#include <sys/time.h>

#include <sys/types.h>

#include <sys/un.h>

#include <sys/wait.h>

#include <unistd.h>



#include <linux/netlink.h>



#include <memory>

#include <thread>



#include <selinux/selinux.h>

#include <selinux/label.h>

#include <selinux/android.h>

#include <selinux/avc.h>



#include <private/android_filesystem_config.h>



#include <android-base/file.h>

#include <android-base/logging.h>

#include <android-base/stringprintf.h>

#include <android-base/unique_fd.h>

#include <cutils/list.h>

#include <cutils/uevent.h>

#include <private/android_filesystem_config.h>

#include <selinux/android.h>

#include <selinux/avc.h>

#include <selinux/label.h>

#include <selinux/selinux.h>



#include "devices.h"

#include "ueventd_parser.h"

#include "util.h"

#include "log.h"



#define SYSFS_PREFIX    "/sys"

static const char *firmware_dirs[] = { "/etc/firmware",