Commit Graph

65 Commits

Author SHA1 Message Date
Yacine Hmito
1d8313042d Renamed subdirectories in Android SKD's build-tools
Nix unzips the different components of the Android SDK one by one.
It followed the directory structure of complete packages released for
mainstream OS but the names of the directories in build-tools doesn't
match those.
As a result, some programs assuming the usual directory structure and
naming conventions broke (in my case it is a gradle plugin).
This is a fix. It may introduce a regression if some programs rely on
the current behavior.
2016-01-18 00:42:54 +01: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
Vladimír Čunát
8f33b8cc93 mass rewrite of find parameters to cross-platform style
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
2015-09-06 10:26:30 +02: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
Nikolay Amiantov
298341f1c4 androidEnv.platformTools: add /bin 2015-04-22 17:35:00 +03: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
Eric Seidel
b070eacfcd rename occurrences of cc.gcc to cc.cc 2015-01-14 20:51:58 -08:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Shea Levy
7e0a5c38f3 More gcc->cc refs 2014-12-26 12:33:16 -05:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06: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
35d5e4de76 add android build tools to $PATH
commited on behalf of ewemoa
2014-11-24 00:47:57 -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
Domen Kožar
11a414ddd5 fix eval 2014-11-24 08:57:18 +01:00
Maciek Starzyk
9bb60c9e20 Removed duplicate 2014-11-11 00:14:54 +01:00
Maciek Starzyk
e176105535 android-ndk: r9d -> r10c 2014-11-10 23:54:44 +01:00
Longrin Wischnewski
6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Siarhei Zirukin
ec1118cbb9 androidndk: fix make-standalone-toolchain.sh helper script
The script does a copy of a toolchain and then rearranges files a bit.
The problem is that these files have the same permissions (read-only)
as installed ones. The patch fixes the problem by changing permissions
of the copy before doing anything else.
2014-09-25 11:59:16 +02:00
Emil Rangden
17d7f653c3 Make emulator script run without tools in path 2014-09-17 20:58:09 +02:00
Sander van der Burg
7b7fd5044f androidsdk: remove obsolete workaround 2014-09-02 19:19:03 +02:00
Sander van der Burg
800beea5f9 androidsdk: Bump to version 23.02 and update all its plugins and conversion scripts 2014-09-02 19:18:30 +02:00
Cray Elliott
02f5f25b2d merge in ewemoa's zipalign fix with my updated build-tools
now passes Android tests found at https://github.com/svanderburg/nix-androidenvtests !
2014-09-02 19:17:47 +02:00
Cray Elliott
c8871e0b65 ewemoa : add the Android Support repository 2014-09-02 14:09:01 +02:00
Sander van der Burg
3b0c725255 Add attributes for all relevant Android SDK API levels and their capabilities 2014-09-02 14:05:09 +02:00
Jos van den Oever
6f50af7206 Some additional android runtimes. 2014-08-23 11:03:29 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Cillian de Róiste
aa5c229223 androidsdk: upgrade 22.3 -> 22.6.2 2014-05-08 00:49:19 +02:00
Carles Pagès
8267fa4694 androidndk: add v9d
I also updated the buildApp expression so it can build ndk based apps, when
setting useNDK to true.
2014-04-20 11:29:10 +02:00
Sander van der Burg
70449b220d androidsdk: fix activity launching 2014-02-27 23:08:13 +01:00
Sander van der Burg
9d7b1dca8f androidsdk: only create AVD if needed + some fixes 2014-02-27 19:26:18 +01:00
Sander van der Burg
416db1de92 androidsdk: Make AVD storage dir configurable and make activation step optional 2014-02-27 18:46:06 +01:00
Sander van der Burg
1f42b02624 androidenv: also allow references to individual apk files 2014-01-28 19:09:08 +01:00
Sander van der Burg
e998a1c729 Add two additional API level compositions 2014-01-13 13:25:12 +01:00
Shea Levy
4a1a28faeb Revert android build tools update
https://code.google.com/p/android/issues/detail?id=61710
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-02 21:41:40 -05:00
Shea Levy
35e47a4a47 Update android sdks
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-02 20:27:53 -05:00
Sander van der Burg
521ea15f14 We need to use ... to allow other parameters 2013-10-15 16:48:42 +02:00
Sander van der Burg
ce7f235a09 Make arbitrary arguments to the generic builder possible 2013-10-15 16:32:16 +02:00
Mathijs Kwik
5eeb02f67c android-sdk: upgrade to latests versions 2013-09-18 14:37:38 +02:00
Sander van der Burg
370db596b9 Bumped Android SDK to version 22.2 and updated its addons 2013-09-18 12:05:14 +02:00
Sander van der Burg
0e91a58bbe The android GUI does not work if Oracle's JDK is installed. This patch forces it to use OpenJDK 2013-08-08 10:40:09 +02:00
Sander van der Burg
a9b4851b74 The android utility's GUI should work and wrapper scripts in bin/ are replaced by symlinks 2013-08-07 22:12:44 +02:00
Sander van der Burg
d435b39201 Make AVD creating configurable at runtime 2013-08-06 14:11:34 +02:00
Sander van der Burg
dbcb178ef2 Added extraAVDFiles parameter to support custom system images 2013-08-06 11:16:51 +02:00
Sander van der Burg
f5f5f69ef0 The emulator needs file in its PATH and alsaLib 2013-08-05 22:18:56 +02:00