Merge "Revert "Bump Mac from 10.9 to 10.10 to match Studio.""
diff --git a/build/tools/ndk-common.sh b/build/tools/ndk-common.sh
index 170d78d..4fe5030 100644
--- a/build/tools/ndk-common.sh
+++ b/build/tools/ndk-common.sh
@@ -26,7 +26,7 @@
OS=`uname -s`
if [ "$OS" == "Darwin" -a -z "$MACOSX_DEPLOYMENT_TARGET" ]; then
- export MACOSX_DEPLOYMENT_TARGET="10.10"
+ export MACOSX_DEPLOYMENT_TARGET="10.9"
fi
# Find the Android NDK root, assuming we are invoked from a script
diff --git a/docs/Building.md b/docs/Building.md
index 9cf5b0d..7f1977f 100644
--- a/docs/Building.md
+++ b/docs/Building.md
@@ -6,7 +6,7 @@
Both Linux and Windows NDKs are built on Linux machines. Windows host binaries
are cross-compiled with MinGW.
-Building the NDK for Mac OS X requires at least 10.10.
+Building the NDK for Mac OS X requires at least 10.9.
## Prerequisites
diff --git a/docs/changelogs/Changelog-r21.md b/docs/changelogs/Changelog-r21.md
index 16003d8..aba5400 100644
--- a/docs/changelogs/Changelog-r21.md
+++ b/docs/changelogs/Changelog-r21.md
@@ -19,9 +19,8 @@
[blog post]: https://android-developers.googleblog.com/2019/06/moving-android-studio-and-android.html
* macOS 10.8 is no longer supported as of r21b (r21 supports 10.8). macOS 10.15
- requires that binaries be notarized, and notarization is not supported for
- binaries built for 10.8 or older. The NDK now supports macOS 10.10 and up,
- matching Android Studio.
+ requires that binaries be notarized, and notarization is only supported for
+ binaries built for 10.9 or newer.
* [LLD](https://lld.llvm.org/) is now available for testing. AOSP has switched
to using LLD by default and the NDK will follow (timeline unknown). Test LLD
diff --git a/ndk/toolchains.py b/ndk/toolchains.py
index f816097..669f252 100644
--- a/ndk/toolchains.py
+++ b/ndk/toolchains.py
@@ -41,7 +41,7 @@
class DarwinSdk:
"""The Darwin SDK."""
- MACOSX_TARGET = '10.10'
+ MACOSX_TARGET = '10.9'
def __init__(self) -> None:
proc_result = subprocess.run(['xcrun', '--show-sdk-path'],
