more android fixes to simplify PR

Author: hyp

Sources/Foundation/Data.swift

@@ -64,6 +64,8 @@ internal func malloc_good_size(_ size: Int) -> Int {
 import Glibc
 #elseif canImport(Musl)
 import Musl
+#elseif canImport(Android)
+import Android
 #elseif canImport(WASILibc)
 import WASILibc
 #endif

Sources/Foundation/FileManager+POSIX.swift

@@ -11,10 +11,6 @@
 internal func &(left: UInt32, right: mode_t) -> mode_t {
     return mode_t(left) & right
 }
-#elseif os(Android)
-internal func &(left: mode_t, right: Int32) -> mode_t {
-    return left & mode_t(right)
-}
 #endif
 
 #if os(WASI)
@@ -413,7 +409,7 @@ extension FileManager {
                     if !parent.isEmpty && !fileExists(atPath: parent, isDirectory: &isDir) {
                         try createDirectory(atPath: parent, withIntermediateDirectories: true, attributes: attributes)
                     }
-                    if mkdir(pathFsRep, mode_t(S_IRWXU) | mode_t(S_IRWXG) | mode_t(S_IRWXO)) != 0 {
+                    if mkdir(pathFsRep, S_IRWXU | S_IRWXG | S_IRWXO) != 0 {
                         let posixError = errno
                         if posixError == EEXIST && fileExists(atPath: path, isDirectory: &isDir) && isDir.boolValue {
                             // Continue; if there is an existing file and it is a directory, that is still a success.
@@ -432,7 +428,7 @@ extension FileManager {
                     throw _NSErrorWithErrno(EEXIST, reading: false, path: path)
                 }
             } else {
-                if mkdir(pathFsRep, mode_t(S_IRWXU) | mode_t(S_IRWXG) | mode_t(S_IRWXO)) != 0 {
+                if mkdir(pathFsRep, S_IRWXU | S_IRWXG | S_IRWXO) != 0 {
                     throw _NSErrorWithErrno(errno, reading: false, path: path)
                 } else if let attr = attributes {
                     try self.setAttributes(attr, ofItemAtPath: path)

Sources/Foundation/FileManager.swift

@@ -25,7 +25,7 @@ import WinSDK
 import WASILibc
 #endif
 
-#if os(Android)
+#if canImport(Android)
 import Android
 #endif
 
@@ -1346,12 +1346,12 @@ public struct FileAttributeType : RawRepresentable, Equatable, Hashable {
 #else
     internal init(statMode: mode_t) {
         switch statMode & S_IFMT {
-        case mode_t(S_IFCHR): self = .typeCharacterSpecial
-        case mode_t(S_IFDIR): self = .typeDirectory
-        case mode_t(S_IFBLK): self = .typeBlockSpecial
-        case mode_t(S_IFREG): self = .typeRegular
-        case mode_t(S_IFLNK): self = .typeSymbolicLink
-        case mode_t(S_IFSOCK): self = .typeSocket
+        case S_IFCHR: self = .typeCharacterSpecial
+        case S_IFDIR: self = .typeDirectory
+        case S_IFBLK: self = .typeBlockSpecial
+        case S_IFREG: self = .typeRegular
+        case S_IFLNK: self = .typeSymbolicLink
+        case S_IFSOCK: self = .typeSocket
         default: self = .typeUnknown
         }
     }

Sources/Foundation/Host.swift

@@ -12,9 +12,9 @@
 import WinSDK
 #endif
 
-#if os(Android)
+#if canImport(Android)
     import Android
-    // Android Glibc differs a little with respect to the Linux Glibc.
+    // Android Bionic differs a little with respect to the Linux Glibc.
 
     // IFF_LOOPBACK is part of the enumeration net_device_flags, which needs to
     // convert to UInt32.

Sources/Foundation/NSPathUtilities.swift

@@ -803,7 +803,7 @@ internal func _NSCreateTemporaryFile(_ filePath: String) throws -> (Int32, Strin
     }
 
     // Set the file mode to match macOS
-    guard fchmod(fd, mode_t(S_IRUSR) | mode_t(S_IWUSR) | mode_t(S_IRGRP) | mode_t(S_IWGRP) | mode_t(S_IROTH) | mode_t(S_IWOTH)) != -1 else {
+    guard fchmod(fd, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) != -1 else {
         let _errno = errno
         close(fd)
         throw _NSErrorWithErrno(_errno, reading: false, path: pathResult)