Make Android Native a child of Linux.

and workaround `platform.posix.DIR` not being available there.

Author: MohammedKHC

okio/build.gradle.kts

@@ -28,11 +28,6 @@ plugins {
  *   |   |-- mingw
  *   |   |   '-- mingwX64
  *   |   '-- unix
- *   |       |-- androidNative
- *   |       |   |-- androidNativeArm64
- *   |       |   |-- androidNativeArm32
- *   |       |   |-- androidNativeX64
- *   |       |   |-- androidNativeX86
  *   |       |-- apple
  *   |       |   |-- iosArm64
  *   |       |   |-- iosX64
@@ -43,7 +38,12 @@ plugins {
  *   |       |   |-- watchosArm64
  *   |       '-- linux
  *   |           |-- linuxX64
- *   |           '-- linuxArm64
+ *   |           |-- linuxArm64
+ *   |           '-- androidNative
+ *   |               |-- androidNativeArm64
+ *   |               |-- androidNativeArm32
+ *   |               |-- androidNativeX64
+ *   |               |-- androidNativeX86
  *   '-- wasm
  *       '-- wasmJs
  *       '-- wasmWasi
@@ -168,19 +168,13 @@ kotlin {
           createSourceSet("unixMain", parent = nativeMain)
             .also { unixMain ->
               unixMain.dependsOn(nonJsMain)
-              createSourceSet(
-                  "androidNativeMain",
-                  parent = unixMain,
-                  children = androidNativeTargets,
-              ).also { androidNative ->
-                androidNative.dependsOn(nonAppleMain)
-              }
               createSourceSet(
                   "linuxMain",
                   parent = unixMain,
                   children = linuxTargets,
               ).also { linuxMain ->
                 linuxMain.dependsOn(nonAppleMain)
+                createSourceSet("androidNativeMain", parent = linuxMain, children = androidNativeTargets)
               }
               createSourceSet("appleMain", parent = unixMain, children = appleTargets)
             }

okio/src/androidNativeMain/kotlin/okio/AndroidNativePosixVariant.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2026 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package platform.posix
+
+/**
+ * Workaround `platform.posix.DIR` not being available on Android Native.
+ */
+internal typealias DIR = cnames.structs.DIR

okio/src/androidNativeMain/kotlin/platform/posix/DIR.kt

@@ -15,7 +15,6 @@
  */
 package okio
 
-import kotlinx.cinterop.CValuesRef
 import kotlinx.cinterop.alloc
 import kotlinx.cinterop.memScoped
 import kotlinx.cinterop.ptr
@@ -45,9 +44,3 @@ internal actual fun PosixFileSystem.variantMetadataOrNull(path: Path): FileMetad
     )
   }
 }
-
-internal actual val DEFFILEMODE: Int get() = platform.posix.DEFFILEMODE
-internal actual typealias DIR = platform.posix.DIR
-internal actual fun opendir(path: String) = platform.posix.opendir(path)
-internal actual fun readdir(dir: CValuesRef<DIR>) = platform.posix.readdir(dir)
-internal actual fun closedir(dir: CValuesRef<DIR>) = platform.posix.closedir(dir)

okio/src/appleMain/kotlin/okio/ApplePosixVariant.kt

@@ -15,7 +15,6 @@
  */
 package okio
 
-import kotlinx.cinterop.CValuesRef
 import kotlinx.cinterop.alloc
 import kotlinx.cinterop.memScoped
 import kotlinx.cinterop.ptr
@@ -45,9 +44,3 @@ internal actual fun PosixFileSystem.variantMetadataOrNull(path: Path): FileMetad
     )
   }
 }
-
-internal actual val DEFFILEMODE: Int get() = platform.posix.DEFFILEMODE
-internal actual typealias DIR = cnames.structs.__dirstream
-internal actual fun opendir(path: String) = platform.posix.opendir(path)
-internal actual fun readdir(dir: CValuesRef<DIR>) = platform.posix.readdir(dir)
-internal actual fun closedir(dir: CValuesRef<DIR>) = platform.posix.closedir(dir)

okio/src/linuxMain/kotlin/okio/LinuxPosixVariant.kt

@@ -16,7 +16,6 @@
 package okio
 
 import kotlinx.cinterop.CPointer
-import kotlinx.cinterop.CValuesRef
 import kotlinx.cinterop.alloc
 import kotlinx.cinterop.memScoped
 import kotlinx.cinterop.ptr
@@ -205,8 +204,3 @@ internal actual fun PosixFileSystem.variantOpenReadWrite(
 internal actual fun PosixFileSystem.variantCreateSymlink(source: Path, target: Path) {
   throw IOException("Not supported")
 }
-
-internal actual typealias DIR = platform.posix.DIR
-internal actual fun opendir(path: String) = platform.posix.opendir(path)
-internal actual fun readdir(dir: CValuesRef<DIR>) = platform.posix.readdir(dir)
-internal actual fun closedir(dir: CValuesRef<DIR>) = platform.posix.closedir(dir)

okio/src/mingwX64Main/kotlin/okio/WindowsPosixVariant.kt

@@ -15,15 +15,16 @@
  */
 package okio
 
-import kotlinx.cinterop.CPointed
 import kotlinx.cinterop.CPointer
-import kotlinx.cinterop.CValuesRef
 import kotlinx.cinterop.get
 import okio.Path.Companion.toPath
 import okio.internal.toPath
 import platform.posix.EEXIST
+import platform.posix.closedir
 import platform.posix.dirent
 import platform.posix.errno
+import platform.posix.opendir
+import platform.posix.readdir
 import platform.posix.set_posix_errno
 
 internal object PosixFileSystem : FileSystem() {
@@ -116,8 +117,3 @@ internal object PosixFileSystem : FileSystem() {
 
   override fun toString() = "PosixSystemFileSystem"
 }
-
-internal expect class DIR : CPointed
-internal expect fun opendir(path: String): CPointer<DIR>?
-internal expect fun readdir(dir: CValuesRef<DIR>): CPointer<dirent>?
-internal expect fun closedir(dir: CValuesRef<DIR>): Int

okio/src/nativeMain/kotlin/okio/PosixFileSystem.kt

@@ -129,7 +129,7 @@ internal actual fun PosixFileSystem.variantOpenReadOnly(file: Path): FileHandle
   return UnixFileHandle(false, openFile)
 }
 
-internal expect val DEFFILEMODE: Int
+internal const val DEFFILEMODE = 0b110110110 /* octal 666 */
 
 internal actual fun PosixFileSystem.variantOpenReadWrite(
   file: Path,