diff --git a/Package.swift b/Package.swift
index a7bb86c5..fcf3d1b7 100644
--- a/Package.swift
+++ b/Package.swift
@@ -14,21 +14,21 @@ let embeddedSqliteCondition: TargetDependencyCondition? = {
     if useEmbeddedSqlite {
         return nil
     }
-    return .when(platforms: [.windows])
+    return .when(platforms: [.windows, .android])
 }()
 
 let externalSqliteLibraries: [LinkerSetting] = {
     if useEmbeddedSqlite {
         return []
     }
-    return [.linkedLibrary("sqlite3", .when(platforms: [.macOS, .iOS, .tvOS, .watchOS, .visionOS, .macCatalyst, .linux, .android]))] 
+    return [.linkedLibrary("sqlite3", .when(platforms: [.macOS, .iOS, .tvOS, .watchOS, .visionOS, .macCatalyst, .linux]))] 
 }()
 
 let terminfoLibraries: [LinkerSetting] = {
     if !useTerminfo {
         return []
     }
-    return [.linkedLibrary("ncurses", .when(platforms: [.linux, .macOS, .android]))]
+    return [.linkedLibrary("ncurses", .when(platforms: [.linux, .macOS]))]
 }()
 
 let package = Package(
@@ -98,7 +98,10 @@ let package = Package(
         .target(
             name: "llbuildBasic",
             dependencies: ["llvmSupport"],
-            path: "lib/Basic"
+            path: "lib/Basic",
+            linkerSettings: [
+                .linkedLibrary("android-spawn", .when(platforms: [.android]))
+            ]
         ),
         .target(
             name: "llbuildCore",
diff --git a/include/llvm/Config/config.h b/include/llvm/Config/config.h
index e2c2b5ba..64ea45c4 100644
--- a/include/llvm/Config/config.h
+++ b/include/llvm/Config/config.h
@@ -267,7 +267,7 @@
 #define HAVE_SYS_TYPES_H 1
 
 /* Define if the setupterm() function is supported this platform. */
-#if (defined(__APPLE__) && TARGET_OS_IPHONE) || defined(LLBUILD_NO_TERMINFO)
+#if (defined(__APPLE__) && TARGET_OS_IPHONE) || defined(__ANDROID__) || defined(LLBUILD_NO_TERMINFO)
 #undef HAVE_TERMINFO
 #else
 #define HAVE_TERMINFO 1