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

Commit e0ea99cc authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

resolve merge conflicts of a2c2d11f to master 

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I84d0ffa430df3beca0dcc6ed205ce220d7be1f87
parents ba4d92cc a2c2d11f

cmds/installd/InstalldNativeService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ 
#include <android-base/strings.h>

#include <android-base/unique_fd.h>

#include <cutils/fs.h>

#include <cutils/log.h>               // TODO: Move everything to base/logging.

#include <cutils/properties.h>

#include <cutils/sched_policy.h>

#include <log/log.h>               // TODO: Move everything to base/logging.

#include <logwrap/logwrap.h>

#include <private/android_filesystem_config.h>

#include <selinux/android.h>

cmds/installd/dexopt.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ 
#include <sys/wait.h>

#include <unistd.h>



#include <android/log.h>               // TODO: Move everything to base/logging.

#include <android-base/logging.h>

#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <android-base/unique_fd.h>

#include <cutils/properties.h>

#include <cutils/sched_policy.h>

#include <log/log.h>               // TODO: Move everything to base/logging.

#include <private/android_filesystem_config.h>

#include <system/thread_defs.h>

cmds/installd/globals.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <stdlib.h>

#include <string.h>



#include <android/log.h>              // TODO: Move everything to base::logging.

#include <log/log.h>              // TODO: Move everything to base::logging.



#include <globals.h>

#include <installd_constants.h>

cmds/installd/otapreopt.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ 
#include <sys/stat.h>

#include <sys/wait.h>



#include <android/log.h>

#include <android-base/logging.h>

#include <android-base/macros.h>

#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <cutils/fs.h>

#include <cutils/properties.h>

#include <log/log.h>

#include <private/android_filesystem_config.h>



#include "InstalldNativeService.h"

cmds/installd/utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ 
#include <sys/statfs.h>

#endif



#include <android/log.h>

#include <android-base/logging.h>

#include <android-base/stringprintf.h>

#include <cutils/fs.h>

#include <log/log.h>

#include <private/android_filesystem_config.h>



#include "globals.h"  // extern variables.