diff options
| author | Peter Qiu <zqiu@google.com> | 2015-09-28 08:08:24 -0700 |
|---|---|---|
| committer | Peter Qiu <zqiu@google.com> | 2015-09-28 11:30:04 -0700 |
| commit | 771952dc58b6e5eef5fcfe97a1ba2ac7881b2bfe (patch) | |
| tree | 167097e909709ce800f41f32a98a1c9b03e6eece | |
| parent | 9b1df04c163524658b482602c2070aacddbe7374 (diff) | |
| download | apmanager-771952dc58b6e5eef5fcfe97a1ba2ac7881b2bfe.tar.gz | |
Do not run logger on Android
Logger utility doesn't exist on Android, so do not run it on Android.
Bug: 24451556
TEST=Manual test on dragonboard
TEST=Test AP setup on Chrome OS device
Change-Id: I4014f5ca3ab91b348a98169cb355c6841d6530fd
| -rw-r--r-- | main.cc | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -46,8 +46,11 @@ const char kHelpMessage[] = "\n" namespace { +#if !defined(__ANDROID__) const char kLoggerCommand[] = "/usr/bin/logger"; const char kLoggerUser[] = "syslog"; +#endif // __ANDROID__ + const char kSeccompFilePath[] = "/usr/share/policy/apmanager-seccomp.policy"; } // namespace @@ -65,6 +68,10 @@ void SetupLogging(chromeos::Minijail* minijail, } chromeos::InitLog(log_flags); +#if !defined(__ANDROID__) + // Logger utility doesn't exist on Android, so do not run it on Android. + // TODO(zqiu): add support to redirect stderr logs from child processes + // to Android logging facility. if (!foreground) { vector<char*> logger_command_line; int logger_stdin_fd; @@ -93,6 +100,7 @@ void SetupLogging(chromeos::Minijail* minijail, } close(logger_stdin_fd); } +#endif // __ANDROID__ } void DropPrivileges(chromeos::Minijail* minijail) { |