From 3d487aede5cb58e3ecd1ddd5dff2df4301c0873a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20Go=CC=81mez?= <pedro@goodnotesapp.com>
Date: Thu, 25 Jun 2026 14:35:19 +0200
Subject: [PATCH] feat: enable CoreGraphics polyfill on Android

Adds os(Android) alongside os(WASI) and os(Linux) to every gate that
selects the pure-Swift CoreGraphics polyfill. The polyfill is Foundation
only, so it works on Android without further changes; this just opts
the platform in so downstream packages (GoodNotes' SVGToNotesItems,
CommonNLI) can build for Android the same way they already build for
WASI/Linux.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 Source/CoreGraphicsPolyfill.swift                    | 2 +-
 Source/Model/Images/SVGDataImage.swift               | 4 ++--
 Source/Model/Images/SVGURLImage.swift                | 2 +-
 Source/Model/Nodes/SVGDefs.swift                     | 2 +-
 Source/Model/Nodes/SVGGroup.swift                    | 4 ++--
 Source/Model/Nodes/SVGImage.swift                    | 4 ++--
 Source/Model/Nodes/SVGMarker.swift                   | 4 ++--
 Source/Model/Nodes/SVGNode.swift                     | 4 ++--
 Source/Model/Nodes/SVGShape.swift                    | 4 ++--
 Source/Model/Nodes/SVGText.swift                     | 4 ++--
 Source/Model/Nodes/SVGUserSpaceNode.swift            | 2 +-
 Source/Model/Nodes/SVGViewport.swift                 | 4 ++--
 Source/Model/Primitives/SVGColor.swift               | 2 +-
 Source/Model/Primitives/SVGFont.swift                | 2 +-
 Source/Model/Primitives/SVGGradient.swift            | 2 +-
 Source/Model/Primitives/SVGLength.swift              | 2 +-
 Source/Model/Primitives/SVGPaint.swift               | 2 +-
 Source/Model/Primitives/SVGPreserveAspectRatio.swift | 2 +-
 Source/Model/Primitives/SVGStroke.swift              | 2 +-
 Source/Model/Shapes/SVGCircle.swift                  | 4 ++--
 Source/Model/Shapes/SVGEllipse.swift                 | 4 ++--
 Source/Model/Shapes/SVGLine.swift                    | 4 ++--
 Source/Model/Shapes/SVGPath.swift                    | 4 ++--
 Source/Model/Shapes/SVGPolygon.swift                 | 4 ++--
 Source/Model/Shapes/SVGPolyline.swift                | 4 ++--
 Source/Model/Shapes/SVGRect.swift                    | 4 ++--
 Source/Parser/SVG/Elements/SVGImageParser.swift      | 2 +-
 Source/Parser/SVG/Elements/SVGTextParser.swift       | 2 +-
 Source/Parser/SVG/SVGIndex.swift                     | 2 +-
 Source/Parser/SVG/SVGParserBasics.swift              | 2 +-
 Source/Parser/SVG/SVGParserPrimitives.swift          | 2 +-
 Source/Parser/SVG/SVGPathReader.swift                | 6 +++---
 Source/Parser/SVG/SVGView.swift                      | 2 +-
 Source/Parser/XML/DOMParser.swift                    | 2 +-
 Source/Parser/XML/XMLNode.swift                      | 2 +-
 Source/Serialization/Serializations.swift            | 2 +-
 Source/UI/UIExtensions.swift                         | 2 +-
 Tests/CoreGraphicsPolyfillTests/PolyfillTests.swift  | 2 +-
 38 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/Source/CoreGraphicsPolyfill.swift b/Source/CoreGraphicsPolyfill.swift
index 83c47adb..65dbfacc 100644
--- a/Source/CoreGraphicsPolyfill.swift
+++ b/Source/CoreGraphicsPolyfill.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
     private let KAPPA: CGFloat = 0.5522847498  // 4 *(sqrt(2) -1)/3
 
     public struct CGAffineTransform: Equatable {
diff --git a/Source/Model/Images/SVGDataImage.swift b/Source/Model/Images/SVGDataImage.swift
index 7102972d..1c45b238 100644
--- a/Source/Model/Images/SVGDataImage.swift
+++ b/Source/Model/Images/SVGDataImage.swift
@@ -5,7 +5,7 @@
 //  Created by Alisa Mylnikova on 10/06/2021.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
@@ -13,7 +13,7 @@ import Combine
 #endif
 
 public class SVGDataImage: SVGImage {
-    #if os(WASI) || os(Linux)           
+    #if os(WASI) || os(Linux) || os(Android)           
     public var data: Data
     #else
     @Published public var data: Data
diff --git a/Source/Model/Images/SVGURLImage.swift b/Source/Model/Images/SVGURLImage.swift
index bca987a3..b96885d3 100644
--- a/Source/Model/Images/SVGURLImage.swift
+++ b/Source/Model/Images/SVGURLImage.swift
@@ -5,7 +5,7 @@
 //  Created by Alisa Mylnikova on 22/09/2021.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Model/Nodes/SVGDefs.swift b/Source/Model/Nodes/SVGDefs.swift
index 525c76be..13763cf8 100644
--- a/Source/Model/Nodes/SVGDefs.swift
+++ b/Source/Model/Nodes/SVGDefs.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Model/Nodes/SVGGroup.swift b/Source/Model/Nodes/SVGGroup.swift
index ce143cc7..cac5959e 100644
--- a/Source/Model/Nodes/SVGGroup.swift
+++ b/Source/Model/Nodes/SVGGroup.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
@@ -6,7 +6,7 @@ import Combine
 #endif
 
 public class SVGGroup: SVGNode {
-    #if os(WASI) || os(Linux)
+    #if os(WASI) || os(Linux) || os(Android)
     public var contents: [SVGNode] = []
     #else
     @Published public var contents: [SVGNode] = []
diff --git a/Source/Model/Nodes/SVGImage.swift b/Source/Model/Nodes/SVGImage.swift
index da2d974e..a44e337f 100644
--- a/Source/Model/Nodes/SVGImage.swift
+++ b/Source/Model/Nodes/SVGImage.swift
@@ -5,7 +5,7 @@
 //  Created by Alisa Mylnikova on 03/06/2021.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
@@ -14,7 +14,7 @@ import Combine
 
 public class SVGImage: SVGNode {
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
     public var x: CGFloat
     public var y: CGFloat
     public var width: CGFloat
diff --git a/Source/Model/Nodes/SVGMarker.swift b/Source/Model/Nodes/SVGMarker.swift
index c7ed0508..49009a30 100644
--- a/Source/Model/Nodes/SVGMarker.swift
+++ b/Source/Model/Nodes/SVGMarker.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
@@ -60,7 +60,7 @@ public class SVGMarker: SVGGroup {
         case strokeWidth
     }
 
-    #if os(WASI) || os(Linux)
+    #if os(WASI) || os(Linux) || os(Android)
     public var markerHeight: SVGLength
     public var markerUnits: MarkerUnits
     public var markerWidth: SVGLength
diff --git a/Source/Model/Nodes/SVGNode.swift b/Source/Model/Nodes/SVGNode.swift
index 1476a92c..a6e05db7 100644
--- a/Source/Model/Nodes/SVGNode.swift
+++ b/Source/Model/Nodes/SVGNode.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
@@ -7,7 +7,7 @@ import Combine
 
 public class SVGNode: SerializableElement {
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
     public var transform: CGAffineTransform = CGAffineTransform.identity
     public var opaque: Bool
     public var opacity: Double
diff --git a/Source/Model/Nodes/SVGShape.swift b/Source/Model/Nodes/SVGShape.swift
index e186de2b..d2b2ae83 100644
--- a/Source/Model/Nodes/SVGShape.swift
+++ b/Source/Model/Nodes/SVGShape.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
@@ -7,7 +7,7 @@ import Combine
 
 public class SVGShape: SVGNode {
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
     public var fill: SVGPaint?
     public var stroke: SVGStroke?
 #else
diff --git a/Source/Model/Nodes/SVGText.swift b/Source/Model/Nodes/SVGText.swift
index 098cb99d..3dedbb42 100644
--- a/Source/Model/Nodes/SVGText.swift
+++ b/Source/Model/Nodes/SVGText.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
@@ -12,7 +12,7 @@ public class SVGText: SVGNode {
         case trailing
     }
     
-    #if os(WASI) || os(Linux)
+    #if os(WASI) || os(Linux) || os(Android)
     public var text: String
     public var font: SVGFont?
     public var fill: SVGPaint?
diff --git a/Source/Model/Nodes/SVGUserSpaceNode.swift b/Source/Model/Nodes/SVGUserSpaceNode.swift
index c48c6c17..7392c3bc 100644
--- a/Source/Model/Nodes/SVGUserSpaceNode.swift
+++ b/Source/Model/Nodes/SVGUserSpaceNode.swift
@@ -5,7 +5,7 @@
 //  Created by Alisa Mylnikova on 14/10/2020.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Model/Nodes/SVGViewport.swift b/Source/Model/Nodes/SVGViewport.swift
index 8911dcec..c1f43306 100644
--- a/Source/Model/Nodes/SVGViewport.swift
+++ b/Source/Model/Nodes/SVGViewport.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
@@ -6,7 +6,7 @@ import Combine
 #endif
 
 public class SVGViewport: SVGGroup {
-    #if os(WASI) || os(Linux)
+    #if os(WASI) || os(Linux) || os(Android)
     public var width: SVGLength
     public var height: SVGLength
     public var viewBox: CGRect?
diff --git a/Source/Model/Primitives/SVGColor.swift b/Source/Model/Primitives/SVGColor.swift
index bebfd8bd..31fe7b0f 100644
--- a/Source/Model/Primitives/SVGColor.swift
+++ b/Source/Model/Primitives/SVGColor.swift
@@ -5,7 +5,7 @@
 //  Created by Yuriy Strot on 19.01.2021.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Model/Primitives/SVGFont.swift b/Source/Model/Primitives/SVGFont.swift
index 888c6de1..1c777cc9 100644
--- a/Source/Model/Primitives/SVGFont.swift
+++ b/Source/Model/Primitives/SVGFont.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Model/Primitives/SVGGradient.swift b/Source/Model/Primitives/SVGGradient.swift
index 184557bb..61908cf3 100644
--- a/Source/Model/Primitives/SVGGradient.swift
+++ b/Source/Model/Primitives/SVGGradient.swift
@@ -5,7 +5,7 @@
 //  Created by Yuriy Strot on 22.02.2021.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Model/Primitives/SVGLength.swift b/Source/Model/Primitives/SVGLength.swift
index 466afb34..ee947ce2 100644
--- a/Source/Model/Primitives/SVGLength.swift
+++ b/Source/Model/Primitives/SVGLength.swift
@@ -5,7 +5,7 @@
 //  Created by Alisa Mylnikova on 13/10/2020.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Model/Primitives/SVGPaint.swift b/Source/Model/Primitives/SVGPaint.swift
index 19076133..f4555959 100644
--- a/Source/Model/Primitives/SVGPaint.swift
+++ b/Source/Model/Primitives/SVGPaint.swift
@@ -5,7 +5,7 @@
 //  Created by Yuriy Strot on 19.01.2021.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Model/Primitives/SVGPreserveAspectRatio.swift b/Source/Model/Primitives/SVGPreserveAspectRatio.swift
index 0c6461ff..33a7cdba 100644
--- a/Source/Model/Primitives/SVGPreserveAspectRatio.swift
+++ b/Source/Model/Primitives/SVGPreserveAspectRatio.swift
@@ -5,7 +5,7 @@
 //  Created by Yuriy Strot on 20.01.2021.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Model/Primitives/SVGStroke.swift b/Source/Model/Primitives/SVGStroke.swift
index e813f111..57d7252e 100644
--- a/Source/Model/Primitives/SVGStroke.swift
+++ b/Source/Model/Primitives/SVGStroke.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Model/Shapes/SVGCircle.swift b/Source/Model/Shapes/SVGCircle.swift
index 49f8e198..0d6effcb 100644
--- a/Source/Model/Shapes/SVGCircle.swift
+++ b/Source/Model/Shapes/SVGCircle.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
@@ -7,7 +7,7 @@ import Combine
 
 public class SVGCircle: SVGShape {
 
-    #if os(WASI) || os(Linux)
+    #if os(WASI) || os(Linux) || os(Android)
     public var cx: CGFloat
     public var cy: CGFloat
     public var r: CGFloat
diff --git a/Source/Model/Shapes/SVGEllipse.swift b/Source/Model/Shapes/SVGEllipse.swift
index efa9e254..1dde61b8 100644
--- a/Source/Model/Shapes/SVGEllipse.swift
+++ b/Source/Model/Shapes/SVGEllipse.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
@@ -6,7 +6,7 @@ import Combine
 #endif
 
 public class SVGEllipse: SVGShape {
-    #if os(WASI) || os(Linux)
+    #if os(WASI) || os(Linux) || os(Android)
     public var cx: CGFloat
     public var cy: CGFloat
     public var rx: CGFloat
diff --git a/Source/Model/Shapes/SVGLine.swift b/Source/Model/Shapes/SVGLine.swift
index 825e8195..49f2c5e5 100644
--- a/Source/Model/Shapes/SVGLine.swift
+++ b/Source/Model/Shapes/SVGLine.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
@@ -7,7 +7,7 @@ import Combine
 
 public class SVGLine: SVGShape {
 
-    #if os(WASI) || os(Linux)
+    #if os(WASI) || os(Linux) || os(Android)
     public var x1: CGFloat
     public var y1: CGFloat
     public var x2: CGFloat
diff --git a/Source/Model/Shapes/SVGPath.swift b/Source/Model/Shapes/SVGPath.swift
index 0e9b86e2..52e23a9a 100644
--- a/Source/Model/Shapes/SVGPath.swift
+++ b/Source/Model/Shapes/SVGPath.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
@@ -7,7 +7,7 @@ import Combine
 
 public class SVGPath: SVGShape {
 
-    #if os(WASI) || os(Linux)
+    #if os(WASI) || os(Linux) || os(Android)
     public var segments: [PathSegment]
     public var fillRule: CGPathFillRule
     #else
diff --git a/Source/Model/Shapes/SVGPolygon.swift b/Source/Model/Shapes/SVGPolygon.swift
index f323ddd8..83ff8020 100644
--- a/Source/Model/Shapes/SVGPolygon.swift
+++ b/Source/Model/Shapes/SVGPolygon.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
@@ -7,7 +7,7 @@ import Combine
 
 public class SVGPolygon: SVGShape {
 
-    #if os(WASI) || os(Linux)
+    #if os(WASI) || os(Linux) || os(Android)
     public var points: [CGPoint]
     #else
     @Published public var points: [CGPoint]
diff --git a/Source/Model/Shapes/SVGPolyline.swift b/Source/Model/Shapes/SVGPolyline.swift
index eb3e1074..f3220b29 100644
--- a/Source/Model/Shapes/SVGPolyline.swift
+++ b/Source/Model/Shapes/SVGPolyline.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
@@ -6,7 +6,7 @@ import Combine
 #endif
 
 public class SVGPolyline: SVGShape {
-    #if os(WASI) || os(Linux)
+    #if os(WASI) || os(Linux) || os(Android)
     public var points: [CGPoint]
     #else
     @Published public var points: [CGPoint]
diff --git a/Source/Model/Shapes/SVGRect.swift b/Source/Model/Shapes/SVGRect.swift
index 0179896c..def171d0 100644
--- a/Source/Model/Shapes/SVGRect.swift
+++ b/Source/Model/Shapes/SVGRect.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
@@ -7,7 +7,7 @@ import Combine
 
 public class SVGRect: SVGShape {
 
-    #if os(WASI) || os(Linux)
+    #if os(WASI) || os(Linux) || os(Android)
     public var x: CGFloat
     public var y: CGFloat
     public var width: CGFloat
diff --git a/Source/Parser/SVG/Elements/SVGImageParser.swift b/Source/Parser/SVG/Elements/SVGImageParser.swift
index 6a8e8655..f8a1b470 100644
--- a/Source/Parser/SVG/Elements/SVGImageParser.swift
+++ b/Source/Parser/SVG/Elements/SVGImageParser.swift
@@ -5,7 +5,7 @@
 //  Created by Yuri Strot on 29.05.2022.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Parser/SVG/Elements/SVGTextParser.swift b/Source/Parser/SVG/Elements/SVGTextParser.swift
index 5cbbe6fd..a86cdb86 100644
--- a/Source/Parser/SVG/Elements/SVGTextParser.swift
+++ b/Source/Parser/SVG/Elements/SVGTextParser.swift
@@ -5,7 +5,7 @@
 //  Created by Yuri Strot on 29.05.2022.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Parser/SVG/SVGIndex.swift b/Source/Parser/SVG/SVGIndex.swift
index b1a3d188..3b9cef75 100644
--- a/Source/Parser/SVG/SVGIndex.swift
+++ b/Source/Parser/SVG/SVGIndex.swift
@@ -5,7 +5,7 @@
 //  Created by Yuriy Strot on 21.02.2021.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Parser/SVG/SVGParserBasics.swift b/Source/Parser/SVG/SVGParserBasics.swift
index f6cedcc5..72901e81 100644
--- a/Source/Parser/SVG/SVGParserBasics.swift
+++ b/Source/Parser/SVG/SVGParserBasics.swift
@@ -5,7 +5,7 @@
 //  Created by Alisa Mylnikova on 17/07/2020.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Parser/SVG/SVGParserPrimitives.swift b/Source/Parser/SVG/SVGParserPrimitives.swift
index e1376b56..891ec4e9 100644
--- a/Source/Parser/SVG/SVGParserPrimitives.swift
+++ b/Source/Parser/SVG/SVGParserPrimitives.swift
@@ -5,7 +5,7 @@
 //  Created by Alisa Mylnikova on 20/07/2020.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Parser/SVG/SVGPathReader.swift b/Source/Parser/SVG/SVGPathReader.swift
index 378918e4..e076c4c4 100644
--- a/Source/Parser/SVG/SVGPathReader.swift
+++ b/Source/Parser/SVG/SVGPathReader.swift
@@ -11,7 +11,7 @@ public typealias MBezierPath = NSBezierPath
 #elseif os(iOS) || os(tvOS) || os(watchOS)
 import UIKit
 public typealias MBezierPath = UIBezierPath
-#elseif os(WASI) || os(Linux)
+#elseif os(WASI) || os(Linux) || os(Android)
 import Foundation
 #endif
 
@@ -336,7 +336,7 @@ extension SVGPath {
             return CGFloat > 0.5 ? true : false
         }
 
-        #if os(WASI) || os(Linux)
+        #if os(WASI) || os(Linux) || os(Android)
         var bezierPath = MBezierPath()
         #else
         let bezierPath = MBezierPath()
@@ -565,7 +565,7 @@ extension SVGPath {
                 bezierPath.addArc(withCenter: CGPoint(x: cx, y: cy), radius: CGFloat(w / 2), startAngle: extent, endAngle: end, clockwise: arcAngle >= 0)
             } else {
                 let maxSize = CGFloat(max(w, h))
-                #if os(WASI) || os(Linux)
+                #if os(WASI) || os(Linux) || os(Android)
                 var path = MBezierPath(arcCenter: CGPoint.zero, radius: maxSize / 2, startAngle: extent, endAngle: end, clockwise: arcAngle >= 0)
                 #else
                 let path = MBezierPath(arcCenter: CGPoint.zero, radius: maxSize / 2, startAngle: extent, endAngle: end, clockwise: arcAngle >= 0)
diff --git a/Source/Parser/SVG/SVGView.swift b/Source/Parser/SVG/SVGView.swift
index 119437c9..9ad7806d 100644
--- a/Source/Parser/SVG/SVGView.swift
+++ b/Source/Parser/SVG/SVGView.swift
@@ -5,7 +5,7 @@
 //  Created by Alisa Mylnikova on 20/08/2020.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Parser/XML/DOMParser.swift b/Source/Parser/XML/DOMParser.swift
index a88b7108..90e50442 100644
--- a/Source/Parser/XML/DOMParser.swift
+++ b/Source/Parser/XML/DOMParser.swift
@@ -5,7 +5,7 @@
 //  Created by Alisa Mylnikova on 20/08/2020.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 import FoundationXML
 #else
diff --git a/Source/Parser/XML/XMLNode.swift b/Source/Parser/XML/XMLNode.swift
index 2a2cfcc8..c16d8c60 100644
--- a/Source/Parser/XML/XMLNode.swift
+++ b/Source/Parser/XML/XMLNode.swift
@@ -1,4 +1,4 @@
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/Serialization/Serializations.swift b/Source/Serialization/Serializations.swift
index a44879c7..1945190e 100644
--- a/Source/Serialization/Serializations.swift
+++ b/Source/Serialization/Serializations.swift
@@ -5,7 +5,7 @@
 //  Created by Yuriy Strot on 18.01.2021.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Source/UI/UIExtensions.swift b/Source/UI/UIExtensions.swift
index a35d9d21..1975293c 100644
--- a/Source/UI/UIExtensions.swift
+++ b/Source/UI/UIExtensions.swift
@@ -5,7 +5,7 @@
 //  Created by Yuri Strot on 25.05.2022.
 //
 
-#if os(WASI) || os(Linux)
+#if os(WASI) || os(Linux) || os(Android)
 import Foundation
 #else
 import SwiftUI
diff --git a/Tests/CoreGraphicsPolyfillTests/PolyfillTests.swift b/Tests/CoreGraphicsPolyfillTests/PolyfillTests.swift
index 86555c99..075ed768 100644
--- a/Tests/CoreGraphicsPolyfillTests/PolyfillTests.swift
+++ b/Tests/CoreGraphicsPolyfillTests/PolyfillTests.swift
@@ -22,7 +22,7 @@ import XCTest
 
 final class PolyfillTests: XCTestCase {
     
-    #if os(WASI) || os(Linux)
+    #if os(WASI) || os(Linux) || os(Android)
     
     // MARK: - CGAffineTransform Tests