diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-02-27 00:17:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-02-27 00:17:55 +0000 |
| commit | 020442632ec1b453961c944f9cefaa2e5b5109e2 (patch) | |
| tree | 1de003049dcce03dfd66bddb7334243c5f6f62b6 | |
| parent | 3419bd3a05de4e96cc171b1bc590f2c9c1e6b8ab (diff) | |
| parent | ea4160393ef64f608b2c234527c69f93e2203e45 (diff) | |
| download | ndk-020442632ec1b453961c944f9cefaa2e5b5109e2.tar.gz | |
Merge "Revert "Bump Mac from 10.9 to 10.10 to match Studio.""
| -rw-r--r-- | build/tools/ndk-common.sh | 2 | ||||
| -rw-r--r-- | docs/Building.md | 2 | ||||
| -rw-r--r-- | docs/changelogs/Changelog-r21.md | 5 | ||||
| -rw-r--r-- | ndk/toolchains.py | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/build/tools/ndk-common.sh b/build/tools/ndk-common.sh index 170d78d5f..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.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 9cf5b0dbc..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.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 16003d8ef..aba540077 100644 --- a/docs/changelogs/Changelog-r21.md +++ b/docs/changelogs/Changelog-r21.md @@ -19,9 +19,8 @@ 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 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 f816097ab..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.10' + MACOSX_TARGET = '10.9' def __init__(self) -> None: proc_result = subprocess.run(['xcrun', '--show-sdk-path'], |