Luca Favatella
72e3836bfb
androidenv: manually (!) delete oldest revision of google images
...
... as same name hence clashing.
This shall rather be solved by enhancement of the scripts.
2020-03-09 04:47:40 +00:00
Luca Favatella
3286057969
androidenv: fix default platform-tools to a known one
2020-03-09 04:47:40 +00:00
Luca Favatella
6da0e0b7d7
androidenv: bump emulator version to latest stable - as per Linux
...
Move to a known version of the emulator. Each OS has a distinct
version... pick the one on Linux. A better solution would be to let
the user of `emulateApp` overload what the emulator version shall be
(and maybe it is already possible and I do not see it) - without need
to reproduce large portions of `default.nix`.
Using the previous emulator showed the following warning:
```
Your emulator is out of date, please update by launching Android Studio:
```
I am not aware of any reasons for not wanting the latest emulator (as
I expect it shall be compatible usually with more system images - not
less), so bump its default version.
Emulator release notes:
https://developer.android.com/studio/releases/emulator
2020-03-09 04:47:40 +00:00
Luca Favatella
e003ca046c
androidenv: update the generated expressions
...
... running `generate.sh`.
2020-03-09 04:47:39 +00:00
Luca Favatella
de119ca8ea
androidenv: fix packages xsl used in generate.sh
...
Entry `<remotePackage path="cmdline-tools;latest">` resulted in a
duplicated `"cmdline-tools"."1.0"`.
2020-03-09 04:45:36 +00:00
Tad Fisher
d574ea45a2
androidenv: fix system images xsl used in generate.sh
...
Updated with fixes for `convertsystemimages.xsl`:
- Use `type-details/codename` if it exists, falling back to
`type-details/api-level`: this results in "Q" rather than "28" for
preview images
- Use `<xsl:text>` elements to control whitespace in the output.
This is extracted from https://github.com/NixOS/nixpkgs PR 58131.
2020-03-09 03:43:19 +00:00
Tad Fisher
6f80983963
androidenv: update generate.sh to use nix-shell and fail on error
...
Update generate.sh to run using nix-shell. Also make it fail with
meaningful output instead of writing empty output files.
This is extracted from https://github.com/NixOS/nixpkgs PR 58131.
This relies on the shebang being used.
2020-03-09 03:43:19 +00:00
Sander van der Burg
3deb1caa82
androidenv: add platform SDK 29
2020-03-01 20:23:39 +01:00
Lenz Weber
5ef31532b1
androidenv build-tools: fix old versions under linux
2020-02-14 11:41:57 +01:00
Hernawan Faïz Abdillah
82a2a9eabf
androidenv.lldb: Fix libssl not found
2020-01-07 14:02:13 +07:00
Robin Gloster
760e23136a
treewide: *inputs are lists
2019-12-31 01:09:25 +01:00
Kirill Elagin
2e79c2d969
android: Install platform-tools binaries on all OSes
2019-11-19 22:29:21 +01:00
Jamey Sharp
5d1c9cebd6
deployAndroidPackage: prefer local builds
...
These derivations just unzip something and maybe do a little patching,
so there's no benefit to sending the zip file off to a build server and
then downloading the unzipped results again.
2019-11-16 14:37:47 +01:00
volth
7b8fb5c06c
treewide: remove redundant quotes
2019-09-08 23:38:31 +00:00
Frederik Rietdijk
5061fe0c2c
Merge staging-next into staging
2019-08-28 08:26:42 +02:00
volth
35d68ef143
treewide: remove redundant quotes
2019-08-26 21:40:19 +00:00
Erik Arvstedt
1b81302d49
androidenv: rename stdenv.lib -> lib
...
Removes some visual clutter.
2019-08-17 11:19:06 +02:00
Erik Arvstedt
2ec43d3509
androidenv/emulate-app: rename androidsdkComposition -> sdk
...
This greatly improves readability by shortening some of the overlong lines.
2019-08-17 11:19:05 +02:00
Erik Arvstedt
0dab612395
androidenv/emulate-app: fix passing extra args to the sdk composition
...
This feature was originally intended but left unfinished, as indicated
by the unused variables 'args' and 'androidSdkArgNames'.
2019-08-17 11:19:02 +02:00
Erik Arvstedt
e48d97f640
androidenv: fix deployment of google_apis* system images
...
Fixes #56866
2019-08-17 11:18:59 +02:00
volth
f3282c8d1e
treewide: remove unused variables ( #63177 )
...
* treewide: remove unused variables
* making ofborg happy
2019-06-16 19:59:05 +00:00
Matthew Bauer
dc42372809
Merge pull request #61168 from matthewbauer/release-cross-fixes
...
release-cross.nix changes/fixes
2019-06-03 20:13:43 -04:00
edef
c89b2de425
androidenv: fix the $out/bin symlink for ndk-bundle
2019-05-24 02:32:14 +00:00
Matthew Bauer
4acc434847
androidenv: add more context to os not found error
...
We don’t have android sdk available for aarch64, so this error happens
a lot. Adding some context on what is going on makes this clearer.
2019-05-08 21:45:33 -04:00
Jan Malakhovski
32e854c156
androidenv: move defaults to package file
2019-02-03 15:33:21 +00:00
Matthew Bauer
9c770c4efa
androidenv: move licenseAccepted condition to androidsdk
...
The NDK can be built without accepting the license.
2019-01-29 21:13:41 -05:00
Sander van der Burg
287e92ad47
androidenv: Remove unused patch
2019-01-26 23:17:30 +01:00
Sander van der Burg
9130c1d592
androidsdk: fix missing fontconfig library reference when tools version 26.1.x is used
2019-01-26 21:35:18 +01:00
Sander van der Burg
3bfd3e73bf
Reintroduce licenseAccepted option
2018-12-18 21:16:07 +01:00
Sander van der Burg
074c7e99e0
Fix standalone generation script
2018-12-18 21:16:07 +01:00
Sander van der Burg
cb42643b95
Fix inclusion of sources
2018-12-18 21:16:07 +01:00
Sander van der Burg
74750dc67d
Replace androidenv by new implementation
2018-12-18 21:16:06 +01:00
Sander van der Burg
2757ddb182
Separate androidndkpkgs from androidenv
2018-12-18 21:14:43 +01:00
Bastian Köcher
cf2d35d889
androidndk: Adds missing patch for 18b
2018-12-16 10:45:42 +01:00
Bastian Köcher
bf44d81df9
androidndk: 17c -> 18b
2018-11-20 11:21:42 +01:00
Clemens Fruhwirth
b4d9f6ddca
androidsdk: Re-add emulator that was broken out of the sdk-tools package.
2018-11-12 13:06:22 -04:00
David McFarland
c43abffb9c
androidsdk: fix monitor interpreter path
2018-11-10 15:23:11 -04:00
Nick Novitski
d861da151f
androidenv: version buildTools and add buildToolsVersions sdk argument
2018-10-26 22:09:47 -07:00
Nick Novitski
4a0ae5d7d6
androidenv: add androidsdk_{8_1,9_0}{,_extras}
2018-10-26 20:45:52 -07:00
Nick Novitski
a61f31cf23
androidenv: run ./fetch.sh
...
Manually corrected three problems:
- fetch.sh: android cli cannot find java executable
- addons.nix: google_apis_25 expression not added correctly
- addons.nix: android_support_extra expression deleted (replaced in android 9 with jetpack/androidx)
2018-10-26 20:45:51 -07:00
Nick Novitski
6e07691ed7
androidenv: remove android
command from fetch.sh
...
It's deprecated, and no longer prints the urls of any xml files for the script
to parse.
2018-10-26 20:45:51 -07:00
Nick Novitski
ec8f320797
androidenv.androidndk: patch prebuilt 64bit binaries
2018-10-26 20:45:51 -07:00
Nick Novitski
f5c2960a11
androidenv.buildTools: patch hard-coded /bin/ls paths
2018-10-26 20:45:40 -07:00
Nick Novitski
ad501e4c2f
androidenv.buildtools: 28.0.2 -> 28.0.3
2018-10-25 11:56:47 -07:00
Nick Novitski
950608bae0
androidsdk: 25.2.5 -> 26.1.1, license agreement
2018-10-25 11:56:47 -07:00
Matthew Bauer
deee27973e
Merge pull request #46720 from baldo/android-platform-tools
...
android-platform-tools: 26.0.2 -> 28.0.1
2018-10-05 22:42:30 -05:00
John Ericson
226d574870
Merge remote-tracking branch 'upstream/master' into darwin-android-ndk-for-master
2018-09-17 22:48:25 -04:00
John Ericson
6769437186
androidndk: Add Darwin support
...
Also switch Linux to using the official sha1 hashes for consistency.
They are gotten from https://developer.android.com/ndk/downloads/ .
2018-09-17 22:34:37 -04:00
Andreas Baldeau
1de1bc8038
android-platform-tools: patchelf also binaries new in 28.0.1.
2018-09-16 00:29:46 +02:00
Andreas Baldeau
906e69d638
android-platform-tools: 26.0.2 -> 28.0.1
2018-09-15 23:29:20 +02:00