commit b59b1089308b99b5ec752e2de10628facf580b86
author Frederick Mayle <fmayle@google.com> Tue Aug 02 01:19:36 2022 +0000
committer crosvm LUCI <crosvm-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 02 18:30:40 2022 +0000
tree 86c3b8a4dc10a9a785c9e6a3b04fbd7edde5f935
parent d66dfefb4af6302605abe5994818593c8a6c7649

base: syslog: Fix android build

bionic (the android libc) doesn't have shm_open or shm_unlink.

TEST=presubmit
BUG=b:228881485

Change-Id: Ic0df86387a1110835b1e53a68d249fa3d55803ab
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3803896
Reviewed-by: Devin Moore <devinmoore@google.com>
Auto-Submit: Frederick Mayle <fmayle@google.com>
Tested-by: Frederick Mayle <fmayle@google.com>
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Commit-Queue: Dennis Kempin <denniskempin@google.com>

base/src/sys/unix/syslog.rs

diff --git a/base/src/sys/unix/syslog.rs b/base/src/sys/unix/syslog.rs
index cad0cd2..ea26af8 100644
--- a/base/src/sys/unix/syslog.rs
+++ b/base/src/sys/unix/syslog.rs
@@ -14,11 +14,16 @@
     use std::io::SeekFrom;
     use std::os::unix::io::FromRawFd;
 
-    use libc::shm_open;
-    use libc::shm_unlink;
-    use libc::O_CREAT;
-    use libc::O_EXCL;
-    use libc::O_RDWR;
+    cfg_if::cfg_if! {
+        // ANDROID: b/228881485
+        if #[cfg(not(target_os = "android"))] {
+            use libc::shm_open;
+            use libc::shm_unlink;
+            use libc::O_CREAT;
+            use libc::O_EXCL;
+            use libc::O_RDWR;
+        }
+    }
 
     use crate::syslog::*;
 
@@ -34,6 +39,7 @@
     }
 
     #[test]
+    #[cfg(not(target_os = "android"))] // ANDROID: b/228881485
     fn syslog_file() {
         ensure_inited().unwrap();
         let shm_name = CStr::from_bytes_with_nul(b"/crosvm_shm\0").unwrap();