aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2020-02-11 14:01:11 -0800
committerDan Albert <danalbert@google.com>2020-02-11 14:04:32 -0800
commit39308a11b5e34a83aa6ff18523a59593e450a323 (patch)
tree1de003049dcce03dfd66bddb7334243c5f6f62b6
parenta03a6254509f5b0cef1e761390be06ba7e298481 (diff)
downloadndk-39308a11b5e34a83aa6ff18523a59593e450a323.tar.gz
Update Mac OS X deployment target to 10.9.
Binaries built against 10.8 cannot be notarized, and thus cannot be run on Catalina. Test: None, need the build server to produce the artifacts first Bug: http://b/143105198 Bug: https://github.com/android/ndk/issues/1060 Change-Id: I205f83d61d5b5785491de233346c9ebf4fcfba42
-rw-r--r--build/tools/ndk-common.sh2
-rw-r--r--docs/Building.md2
-rw-r--r--docs/changelogs/Changelog-r21.md4
-rw-r--r--ndk/toolchains.py2
4 files changed, 7 insertions, 3 deletions
diff --git a/build/tools/ndk-common.sh b/build/tools/ndk-common.sh
index 737e0e450..4fe5030b0 100644
--- a/build/tools/ndk-common.sh
+++ b/build/tools/ndk-common.sh
@@ -26,7 +26,7 @@ fi
OS=`uname -s`
if [ "$OS" == "Darwin" -a -z "$MACOSX_DEPLOYMENT_TARGET" ]; then
- export MACOSX_DEPLOYMENT_TARGET="10.8"
+ 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 6f41b08b0..7f1977f73 100644
--- a/docs/Building.md
+++ b/docs/Building.md
@@ -6,7 +6,7 @@ https://android.googlesource.com/platform/ndk/+/master/docs/Building.md.
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.8.
+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 defa211fe..aba540077 100644
--- a/docs/changelogs/Changelog-r21.md
+++ b/docs/changelogs/Changelog-r21.md
@@ -18,6 +18,10 @@ For Android Studio issues, follow the docs on the [Android Studio site].
[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 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
in your app by passing `-fuse-ld=lld` when linking. Note that [Issue 843]
diff --git a/ndk/toolchains.py b/ndk/toolchains.py
index 1e719bf96..669f2527d 100644
--- a/ndk/toolchains.py
+++ b/ndk/toolchains.py
@@ -41,7 +41,7 @@ class LinkerOption(enum.Enum):
class DarwinSdk:
"""The Darwin SDK."""
- MACOSX_TARGET = '10.8'
+ MACOSX_TARGET = '10.9'
def __init__(self) -> None:
proc_result = subprocess.run(['xcrun', '--show-sdk-path'],