diff options
author | Morgan Jones <me@numin.it> | 2021-04-10 17:54:01 -0600 |
---|---|---|
committer | Morgan Jones <me@numin.it> | 2021-04-24 15:56:08 -0600 |
commit | a7e5b070beba7a11677c1c4050a105aefead2854 (patch) | |
tree | 7404df83e6dbc5c8c5446fa5baabb8a1746552e7 /doc/languages-frameworks | |
parent | 089908b9db074b5103cda022f25b6689c84ec0dd (diff) |
androidenv: Allow multiple ndkVersions to be specified
Android is deprecating ndk.dir in favor of specifying exact NDK version in Gradle configuration. Ensure that we can support multiple NDKs, and link them into the location the Android Gradle Plugin expects.
Diffstat (limited to 'doc/languages-frameworks')
-rw-r--r-- | doc/languages-frameworks/android.section.md | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md index 416073df078ec..e7dbbf6f8ec19 100644 --- a/doc/languages-frameworks/android.section.md +++ b/doc/languages-frameworks/android.section.md @@ -25,7 +25,7 @@ let abiVersions = [ "armeabi-v7a" "arm64-v8a" ]; cmakeVersions = [ "3.10.2" ]; includeNDK = true; - ndkVersion = "22.0.7026061"; + ndkVersions = ["22.0.7026061"]; useGoogleAPIs = false; useGoogleTVAddOns = false; includeExtras = [ @@ -52,7 +52,11 @@ The following parameters are supported: * `cmakeVersions` specifies which CMake versions should be deployed. * `includeNDK` specifies that the Android NDK bundle should be included. Defaults to: `false`. -* `ndkVersion` specifies the NDK version that we want to use. +* `ndkVersions` specifies the NDK versions that we want to use. These are linked + under the `ndk` directory of the SDK root, and the first is linked under the + `ndk-bundle` directory. +* `ndkVersion` is equivalent to specifying one entry in `ndkVersions`, and + `ndkVersions` overrides this parameter if provided. * `includeExtras` is an array of identifier strings referring to arbitrary add-on packages that should be installed. * `platformVersions` specifies which platform SDK versions should be included. |