From 85e3d0110fbe8116e0e8b77caf8cb2140423540b Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 26 Oct 2016 19:20:58 -0700 Subject: [PATCH] Remove support for building with OSX 10.8/9 SDKs Our minimum build version listed on source.android.com is 10.10. Change the minimum used SDK to 10.10, but keep the deployed version at 10.8 so that our distributed tools still work on older versions. CoreBluetooth/CoreBluetooth.h isn't available directly in older SDKs, but we need to include it in the 10.12 SDK. Test: `m -j` with 10.11, 10.12 SDKs. Test: Verified the builders all have at least 10.10 sdk available. Change-Id: I82321875b8b3a4099ea829ce2d75e1af29cb38c6 --- cc/config/x86_darwin_host.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cc/config/x86_darwin_host.go b/cc/config/x86_darwin_host.go index b17395d6b..2db3cbf12 100644 --- a/cc/config/x86_darwin_host.go +++ b/cc/config/x86_darwin_host.go @@ -42,14 +42,14 @@ var ( "-g", // from build/core/combo/select.mk "-fno-strict-aliasing", // from build/core/combo/select.mk "-isysroot ${macSdkRoot}", - "-mmacosx-version-min=${macSdkVersion}", - "-DMACOSX_DEPLOYMENT_TARGET=${macSdkVersion}", + "-mmacosx-version-min=${macMinVersion}", + "-DMACOSX_DEPLOYMENT_TARGET=${macMinVersion}", } darwinLdflags = []string{ "-isysroot ${macSdkRoot}", "-Wl,-syslibroot,${macSdkRoot}", - "-mmacosx-version-min=${macSdkVersion}", + "-mmacosx-version-min=${macMinVersion}", } // Extended cflags @@ -85,11 +85,9 @@ var ( darwinX8664ClangLdflags = ClangFilterUnknownCflags(darwinX8664Ldflags) darwinSupportedSdkVersions = []string{ - "10.8", - "10.9", "10.10", "10.11", - "10.12", + "10.12", } darwinAvailableLibraries = append( @@ -119,7 +117,7 @@ func init() { pctx.VariableFunc("macSdkRoot", func(config interface{}) (string, error) { return xcrunSdk(config.(android.Config), "--show-sdk-path") }) - pctx.StaticVariable("macSdkVersion", darwinSupportedSdkVersions[0]) + pctx.StaticVariable("macMinVersion", "10.8") pctx.VariableFunc("MacArPath", func(config interface{}) (string, error) { bytes, err := exec.Command("xcrun", "--find", "ar").Output() return strings.TrimSpace(string(bytes)), err