From a7e5b070beba7a11677c1c4050a105aefead2854 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 10 Apr 2021 17:54:01 -0600 Subject: 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. --- doc/languages-frameworks/android.section.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'doc/languages-frameworks') diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md index 416073df078..e7dbbf6f8ec 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. -- cgit 1.4.1