Merge pull request #81921 from compnerd/android-parameters

compnerd · web-flow · commit b0747b24ace4 · 2025-06-03T08:37:55.000-07:00
utils: repair the Android build
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -2360,6 +2360,9 @@ function Build-ExperimentalRuntime {
         CMAKE_Swift_COMPILER_WORKS = "YES";
         CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
         CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
+
+        Swift_SDKROOT = (Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental");
+        SwiftCore_ARCH_SUBDIR = $Platform.Architecture.LLVMName;
       }
 
     Build-CMakeProject `
@@ -2376,6 +2379,9 @@ function Build-ExperimentalRuntime {
         CMAKE_Swift_COMPILER_WORKS = "YES";
         CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
         CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
+
+        Swift_SDKROOT = (Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental");
+        SwiftCore_ARCH_SUBDIR = $Platform.Architecture.LLVMName;
       }
 
     Build-CMakeProject `
@@ -2392,6 +2398,9 @@ function Build-ExperimentalRuntime {
         CMAKE_Swift_COMPILER_WORKS = "YES";
         CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
         CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
+
+        Swift_SDKROOT = (Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental");
+        SwiftCore_ARCH_SUBDIR = $Platform.Architecture.LLVMName;
       }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -2360,6 +2360,9 @@ function Build-ExperimentalRuntime {`
`2360`	`2360`	`CMAKE_Swift_COMPILER_WORKS = "YES";`
`2361`	`2361`	`CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";`
`2362`	`2362`	`CMAKE_SYSTEM_NAME = $Platform.OS.ToString();`
	`2363`	`+`
	`2364`	`+ Swift_SDKROOT = (Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental");`
	`2365`	`+ SwiftCore_ARCH_SUBDIR = $Platform.Architecture.LLVMName;`
`2363`	`2366`	`}`
`2364`	`2367`
`2365`	`2368`	Build-CMakeProject `
`@@ -2376,6 +2379,9 @@ function Build-ExperimentalRuntime {`
`2376`	`2379`	`CMAKE_Swift_COMPILER_WORKS = "YES";`
`2377`	`2380`	`CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";`
`2378`	`2381`	`CMAKE_SYSTEM_NAME = $Platform.OS.ToString();`
	`2382`	`+`
	`2383`	`+ Swift_SDKROOT = (Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental");`
	`2384`	`+ SwiftCore_ARCH_SUBDIR = $Platform.Architecture.LLVMName;`
`2379`	`2385`	`}`
`2380`	`2386`
`2381`	`2387`	Build-CMakeProject `
`@@ -2392,6 +2398,9 @@ function Build-ExperimentalRuntime {`
`2392`	`2398`	`CMAKE_Swift_COMPILER_WORKS = "YES";`
`2393`	`2399`	`CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";`
`2394`	`2400`	`CMAKE_SYSTEM_NAME = $Platform.OS.ToString();`
	`2401`	`+`
	`2402`	`+ Swift_SDKROOT = (Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental");`
	`2403`	`+ SwiftCore_ARCH_SUBDIR = $Platform.Architecture.LLVMName;`
`2395`	`2404`	`}`
`2396`	`2405`	`}`
`2397`	`2406`	`}`