StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bump minimum MacOS version to 10.13" am: db45fb250d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1780977

Change-Id: Ia9f9763792d724b18c0c553af8a812662b8312fa
This commit is contained in:
Dan Willemsen
2021-07-30 18:27:11 +00:00
committed by Automerger Merge Worker
parent 1a45180fe7 db45fb250d
commit d7cacef34a
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/config/x86_darwin_host.go
View File

@@ -53,14 +53,12 @@ var (
} }
darwinSupportedSdkVersions = []string{ darwinSupportedSdkVersions = []string{
"10.10",
"10.11",
"10.12",
"10.13", "10.13",
"10.14", "10.14",
"10.15", "10.15",
"11.0", "11.0",
"11.1", "11.1",
"11.3",
} }
darwinAvailableLibraries = append( darwinAvailableLibraries = append(
@@ -89,7 +87,7 @@ func init() {
pctx.VariableFunc("macSdkRoot", func(ctx android.PackageVarContext) string { pctx.VariableFunc("macSdkRoot", func(ctx android.PackageVarContext) string {
return getMacTools(ctx).sdkRoot return getMacTools(ctx).sdkRoot
}) })
pctx.StaticVariable("macMinVersion", "10.10") pctx.StaticVariable("macMinVersion", "10.13")
pctx.VariableFunc("MacArPath", func(ctx android.PackageVarContext) string { pctx.VariableFunc("MacArPath", func(ctx android.PackageVarContext) string {
return getMacTools(ctx).arPath return getMacTools(ctx).arPath
}) })