3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

64 commits

Author SHA1 Message Date
Erik Arvstedt 1b81302d49
androidenv: rename stdenv.lib -> lib
Removes some visual clutter.
2019-08-17 11:19:06 +02:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Jan Malakhovski 32e854c156 androidenv: move defaults to package file 2019-02-03 15:33:21 +00:00
Sander van der Burg 3bfd3e73bf Reintroduce licenseAccepted option 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 bf44d81df9 androidndk: 17c -> 18b 2018-11-20 11:21:42 +01: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 f5c2960a11 androidenv.buildTools: patch hard-coded /bin/ls paths 2018-10-26 20:45:40 -07:00
Nick Novitski 950608bae0 androidsdk: 25.2.5 -> 26.1.1, license agreement 2018-10-25 11:56:47 -07: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
Luigy Leon c759f7a9b7 androidndk: fix eval
fixup from https://github.com/NixOS/nixpkgs/pull/45820

/cc @Ericson2314
2018-09-01 19:40:52 -04:00
John Ericson 2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
Bastian Köcher ea475c1da5 androidndk: Use callPackage to support overriding the fullNdk option 2018-07-10 09:09:34 +02:00
John Ericson bbef861e0f
Merge pull request #42397 from obsidiansystems/more-android-fixes
androidndk: cleanups
2018-06-22 17:17:53 -04:00
Matthew Bauer 7b49d3b335 androidndk: fix eval 2018-06-22 16:51:22 -04:00
Matthew Bauer c8fd285c8d android: add ndkVer to resolve ndk ambiguity
It wasn’t exactly clear which NDK you were using previously. This adds
an attribute to system that handles what version of the NDK we should
use when building things.

/cc @Ericson2314
2018-06-22 11:06:17 -04:00
Matthew Bauer 2a0c328712 androidenv: add "androidsdk_latest" for latest sdk
This is easier than having to remember which SDKs are supported, etc.
Stuff based on this can become more future-proof.
2018-06-21 16:09:11 -04:00
Matthew Bauer b72da4bee8 androidenv.buildGradleApp: refactor 2018-06-21 15:57:56 -04:00
Matthew Bauer 2e8feba171 androidenv: Use fetchzip instead of googlerepository 2018-06-21 12:12:31 -04:00
Ali Abrar 62b59e5353 Add buildGradleApp to androidenv 2018-06-11 13:25:27 -04:00
Bastian Köcher 495c5a2291 androidndk: Fixes missing libraries for prebuilt clang 2018-05-25 17:32:34 +02:00
Bastian Köcher 832a8ca087 androidndk: Fix usage as crossSystem 2018-05-17 17:22:27 +02:00
Bastian Köcher c056694d74 androidndk: Adds versions 17 and 16b 2018-05-17 13:18:05 +02:00
Vladimír Čunát 565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
John Ericson 2482e2858e prebuilt android tools: Init using SDK
Expose as an option for the cross stdenv.
2018-02-27 14:15:39 -05:00
Alexander V. Nikolaev 0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
John Ericson 7748972763 androidenv: Better platform conditionals 2018-02-24 01:43:10 -05:00
John Ericson fe5ae8b550 androidenv: Clean up whitespace 2018-02-24 01:43:10 -05:00
Michael Weiss af78d76718 androidenv: Add the Android Instant Apps SDK 2017-09-09 16:47:19 +02:00
taku0 53301fcd63 android-sdk: 25.2.3 -> 25.2.5 2017-08-05 22:22:18 +09:00
Michael Weiss d17bcfc5f0 androidenv: Manually update missing packages
Improvement: Use nix-shell for fetch.sh

androidsdk{,_extras}:
- Update to 7.1.1

google_apis_25 is missing after fetch.sh due to an error in addon.xml
(upsteam bug).

Addons:
- Add google_apis_25
- Update google_play_services (v8_rc41 -> v11_rc16)
2017-06-10 03:57:30 +02:00
taku0 a229fd4ce3 androidenv: Add API sources 2016-10-09 19:11:55 +09:00
Herwig Hochleitner 685786b7d7 androidenv: update packages
build-tools      25.1.7 -> 25.2.2
sdk-tools        23.0.1 -> 24.0.2
platform-tools   24 -> 24.0.2
2016-09-14 18:31:22 +02:00
Kirill Boltaev bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Sander van der Burg b17cd148ba androidsdk: fix buildApp and emulateApp functions by providing the right executable paths + fix android emulator by adding dbus to the library path 2016-09-01 13:56:35 +00:00
taku0 2ac2676a17 android-sdk: 24.4.1 -> 25.1.7 (#17193) 2016-07-25 20:47:39 +01:00
taku0 c643c86035 android-platform-tools: 23.0.1 -> 24, etc.
- `adb` is now 64 bit. Linking against 64 bit libraries.
- Added `.lib` or `.out` postfix for 32 bit library packages.
- Some libraries are reside in `lib64` instead of `lib`.
- Other version bumps.
2016-07-21 21:20:05 +09:00
taku0 11af8857cd android-sdk: 24.3.4 -> 24.4, android-ndk: r10c -> r10e 2015-10-18 19:02:23 +09:00
Sander van der Burg 62e676b959 androidenv: fix broken, less frequently used command-line tools 2015-10-15 14:42:24 +00:00
Sander van der Burg 0915f16167 androidsdk: add SDK option for Android API-level 23 2015-10-06 13:26:53 +00:00
Sander van der Burg aeabfbe846 androidsdk: bump to version 24.3.4 and update associated sub packages 2015-10-06 12:27:49 +00:00
taku0 d88736df6c androidsdk: Make monitor and other commands to work 2015-05-03 23:03:36 +09:00
taku0 dd89ec5785 Bump Android packages to newest versions, add androidsdk_5_1_1 and androidsdk_5_1_1_extras to env
Detailed changes:
- android-sdk: update 24.0.1 -> 24.1.2
- android-platforms: add 5.1.1
- android-platform-tools: update 21 -> 22
- android-build-tools: update 21.1.2 -> 22.0.1
- android-support: update 21 -> 22.1.1
- android-support-repository: update 9 -> 14
2015-05-02 22:15:29 +09:00
Gareth Smith 9d57638439 Pulled androidndk_r8e into a separate file. 2015-03-03 15:31:49 +00:00
Gareth Smith 487dc80d8a Add option to build old androidndk r8e.
This version is the one required to build mobile Firefox. See build
documentation here:

https://wiki.mozilla.org/Mobile/Fennec/Android/Detailed_build_instructions#Install_Android_NDK
2015-03-03 14:08:53 +00:00
Gareth Smith 1ae10523c8 Added options for androidsdk to use more extras.
Existing packages should perform unchanged. There's a new package called
androidsdk_5_0_1_extras which adds support for android support libraries
and google play services.
2015-03-01 21:11:03 +00:00
Cray Elliott 80838029ac Bump Android packages to newest versions, add androidsdk_5_0_1 to env
Detailed changes:
- android-sdk: update 23.0.2 -> 24.0.1
- android-platforms: add 5.0.1
- android-platform-tools: update 19 -> 21
- android-build-tools: update 20 -> 21.1.2
- android-support: update 18 -> 21
- android-support-repository: update 5 -> 9

This commit was authored by ewemoa, reviewed by me
2014-12-15 23:29:02 -08:00
Cray Elliott 6872a4a797 Fix Android NDK package, previously ndk-build was not being properly put in $PATH
This commit also brings in the dependencies ndk-build needs and fixes a bug with
permissions

This was commited on behalf of ewemoa
2014-11-24 00:20:40 -08:00