diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-29 18:01:12 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-29 18:01:12 +0000 |
commit | 7b3f0537af1dc5f12537e674b456a4b5459f7be8 (patch) | |
tree | 9216fd3b87f6f623e5c08ef64f4dd704c0cb6e68 /doc | |
parent | 2019d6632b1c59530c292a202ddc50a907118d63 (diff) | |
parent | 2be9646b90944cbf0ffd5a96023b9d370c2949ab (diff) | |
download | nixlib-7b3f0537af1dc5f12537e674b456a4b5459f7be8.tar nixlib-7b3f0537af1dc5f12537e674b456a4b5459f7be8.tar.gz nixlib-7b3f0537af1dc5f12537e674b456a4b5459f7be8.tar.bz2 nixlib-7b3f0537af1dc5f12537e674b456a4b5459f7be8.tar.lz nixlib-7b3f0537af1dc5f12537e674b456a4b5459f7be8.tar.xz nixlib-7b3f0537af1dc5f12537e674b456a4b5459f7be8.tar.zst nixlib-7b3f0537af1dc5f12537e674b456a4b5459f7be8.zip |
Merge master into staging-next
Diffstat (limited to 'doc')
-rw-r--r-- | doc/languages-frameworks/android.section.md | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md index 15b8d3839b19..6f9717ca09cc 100644 --- a/doc/languages-frameworks/android.section.md +++ b/doc/languages-frameworks/android.section.md @@ -13,6 +13,7 @@ with import <nixpkgs> {}; let androidComposition = androidenv.composeAndroidPackages { + cmdLineToolsVersion = "8.0"; toolsVersion = "26.1.1"; platformToolsVersion = "30.0.5"; buildToolsVersions = [ "30.0.3" ]; @@ -42,7 +43,10 @@ exceptions are the tools, platform-tools and build-tools sub packages. The following parameters are supported: -* `toolsVersion`, specifies the version of the tools package to use +* `cmdLineToolsVersion `, specifies the version of the `cmdline-tools` package to use +* `toolsVersion`, specifies the version of the `tools` package. Notice `tools` is + obsolete, and currently only `26.1.1` is available, so there's not a lot of + options here, however, you can set it as `null` if you don't want it. * `platformsToolsVersion` specifies the version of the `platform-tools` plugin * `buildToolsVersions` specifies the versions of the `build-tools` plugins to use. |