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
Bastian Köcher
dd0b3dafc9
androidndk: Add makeStandaloneToolchain
support
...
Example:
```
let
toolchain = (androidenv.androidndk.makeStandaloneToolchain 24 "arm64");
in
...
```
2018-09-07 22:03:26 +02:00
Bastian Köcher
48bdf31f58
androidndk: Fix make_standalone_toolchain.py
...
Python path needs to be absolute and the generated scripts will use also
an absolute path to `bash`.
2018-09-07 21:42:49 +02:00
Shea Levy
18337f3ece
Merge branch 'no-toPath'
2018-09-06 08:09:53 -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
0828e2d8c3
treewide: Remove usage of remaining redundant platform compatability stuff
...
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -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
Matthew Bauer
4a5cbdf5ea
android: add licenses
...
androidndk is apache 2.0
androidsdk is unfree
2018-08-06 10:15:49 -04:00
volth
87f5930c3f
[bot]: remove unreferenced code
2018-07-20 18:48:37 +00:00
Bastian Köcher
ea475c1da5
androidndk: Use callPackage
to support overriding the fullNdk
option
2018-07-10 09:09:34 +02:00
Silvan Mosberger
57bccb3cb8
treewide: http -> https sources ( #42676 )
...
* treewide: http -> https sources
This updates the source urls of all top-level packages from http to
https where possible.
* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Matthew Bauer
e3475f3406
build-gradle-app.nix: fix eval
...
Sorry, typo.
2018-06-27 13:30:16 -04:00
Matthew Bauer
0d9112f01a
build-gradle-app.nix: mark unfree
...
Forgot about this. It needs android-sdk-license & build products should fail when allowUnfree = false.
2018-06-27 13:29:55 -04:00
Matthew Bauer
5000cc555e
android: define __ANDROID_API__ in cflags
...
This is needed for targeting older apis.
2018-06-25 17:12:52 -04:00
Matthew Bauer
d9155904b3
androidndk: add fullNDK option
...
Setting this to true will disable removing some of the unused parts of
the NDK toolchain that is unused in Nixpkgs but may be used by others.
/cc @bkchr
2018-06-25 17:10:11 -04:00
Matthew Bauer
7652b2ef16
android: add --build-id to ldflags
...
the gcc in android does not have this on by default. Doing this will
fix some of the errors in cross-trunk:
https://hydra.nixos.org/build/76354538/nixlog/11
This is related to how separate debug info is handled in Nixpkgs.
2018-06-25 17:10:11 -04:00
Matthew Bauer
37aab4cbb5
android: more output size reduction
...
This should bring us finally under the 2G max. llvm directory was
missing from my last commit.
2018-06-22 19:06:11 -04:00
Matthew Bauer
e1e9b197f9
android: fix from last output size reduction
...
Directories weren’t being removed properly.
2018-06-22 17:49:28 -04: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
054656a2fc
androidndk: reduce output sizw
...
Fixes #41704
2018-06-22 16:48:26 -04:00
Matthew Bauer
a7fc8ad140
androidndk: use unzip
...
This is a free version and preferred to 7zip.
2018-06-22 16:41:08 -04:00
Matthew Bauer
e5d262e1cc
androidndk: fixup
2018-06-22 16:32:05 -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
cf09ffe9aa
android: Use NDK 17 for aarch32
2018-06-22 09:33:25 -04:00
Matthew Justin Bauer
ec2ea29716
Merge pull request #41855 from obsidiansystems/gradle-app
...
init androidenv.buildGradleApp
2018-06-21 17:45:23 -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
Matthew Bauer
dfa2895181
androidndk: fixup asm linking
...
This fixes cross compiling to android that is currently broken. The
asm symlink needs to be set on versions /newer/ than 10e not the other
way around. We also need to use hostInfo’s triple here because ...
/cc @ericson2314 @bkchr
2018-06-13 20:31:33 -04:00
Ryan Trinkle
fe04fe868b
Fix gradle build
2018-06-11 13:25:54 -04:00
Ali Abrar
abddf4ab83
Don't append signingConfigs to build.gradle
2018-06-11 13:25:47 -04:00
Ali Abrar
465e3a01d4
Add android sdk license acceptance
2018-06-11 13:25:41 -04:00
Ali Abrar
1cc64da8d4
add signing to buildGradleApp
2018-06-11 13:25:34 -04:00
Ali Abrar
62b59e5353
Add buildGradleApp to androidenv
2018-06-11 13:25:27 -04:00
Matthew Justin Bauer
673628e10c
androidndk: remove set -x
...
This was causing output limit exceeded in Hydra:
https://hydra.nixos.org/build/75406916
2018-06-07 17:04:08 -04:00
Bastian Köcher
495c5a2291
androidndk: Fixes missing libraries for prebuilt clang
2018-05-25 17:32:34 +02:00
Shea Levy
6da6accd30
treewide: Remove uses of builtins.toPath.
...
toPath has confusing semantics and is never necessary; it can always
either just be omitted or replaced by pre-concatenating `/.`. It has
been marked as "!!! obsolete?" for more than 10 years in a C++
comment, hopefully removing it will let us properly deprecate and,
eventually, remove it.
2018-05-22 16:42:02 -04: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
Bastian Köcher
9f79ac6f3b
androidndk: Drop 32bit support
2018-05-15 16:58:37 +02:00
John Ericson
92b7a814f2
Merge branch 'fix-gcc-with-float'
2018-05-12 15:21:30 -04:00
John Ericson
f2004e6287
lib: Fix float handling for Aarch32
...
Forgot to adjust default so abi with explicit float attr would be used.
2018-05-12 15:18:31 -04:00
John Ericson
6f40d18d44
prebuilt android cc: Edit wrapper to pass the right -m flags for armv7a
...
(cherry picked from commit 827ef09140
)
2018-05-12 15:16:16 -04:00
John Ericson
827ef09140
prebuilt android cc: Edit wrapper to pass the right -m flags for armv7a
2018-05-11 19:17:35 -04:00
Matthew Bauer
143978a477
treewide: remove platform assertions
...
linux: readd assertion
2018-05-03 13:09:20 -05:00
Matthew Justin Bauer
d30f7a5aa8
Merge pull request #36911 from rasendubi/android-build-tools
...
androidenv.buildTools: 26.0.1 -> 26.0.2
2018-04-17 10:26:11 -05:00
Alexey Shmalko
6ef19f8e97
androidenv.buildTools: 26.0.1 -> 26.0.2
2018-03-13 18:15:44 +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
Benjamin Hipple
4e022bab76
android-platform-tools: 26.0.0 -> 26.0.2
2017-12-03 16:58:03 -05:00
Michael Weiss
af78d76718
androidenv: Add the Android Instant Apps SDK
2017-09-09 16:47:19 +02:00
Michael Weiss
498e3a9989
androidenv: Update all packages using fetch.sh
2017-09-09 15:52:07 +02:00
Volth
37e73450d6
androidndk: wrap scripts in $out/libexec
2017-08-17 15:46:01 +00:00
taku0
53301fcd63
android-sdk: 25.2.3 -> 25.2.5
2017-08-05 22:22:18 +09:00
Michael Weiss
8f141b2a07
androidenv: Update all packages using fetch.sh
2017-08-04 00:07:39 +02: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
Michael Weiss
fb26e5c8b6
androidenv: Update all packages using fetch.sh
...
Platforms:
- Update platform_25 (r02 -> r03)
- Add platform_26
Sources:
- Add source_25
2017-06-10 02:29:59 +02:00
Michael Raskin
adadf7e5ce
androidsdk: meta.url to meta.homepage
2017-04-29 12:26:16 +02:00
John Ericson
4c0d7da183
Get rid of all with { inherit... }
and just used let inherit...
...
The old forms presumably predates, or were made in ignorance of,
`let inherit`. This way is better style as the scoping as more lexical,
something which Nix can (or might already!) take advantage of.
2017-03-30 03:05:05 -04:00
taku0
cbcdfdb576
android-sdk: 25.2.2 -> 25.2.3
2016-12-10 19:51:55 +09: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
Tuomas Tynkkynen
f064bfe803
treewide: Use more makeLibraryPath
2016-08-23 02:56:12 +03:00
Tuomas Tynkkynen
74a3a2cd7e
treewide: Use makeBinPath
2016-08-23 01:18:10 +03:00
Tuomas Tynkkynen
51ad423716
treewide: Use makeLibraryPath in 'patchelf --set-rpath' calls
2016-08-23 00:04:39 +03:00
Tuomas Tynkkynen
b7e9207a67
androidenv: Don't build on Hydra
...
Output limit exceeded:
http://hydra.nixos.org/build/38236076
http://hydra.nixos.org/build/38235851
2016-08-02 22:55:43 +03:00
Tuomas Tynkkynen
2258b21e4b
treewide: Add lots of platforms to packages with no meta
...
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03: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
Sander van der Burg
92ef67b57c
androidsdk: fix rpath that includes 32-bit zlib
2016-07-07 16:23:25 +00:00
Benno Fünfstück
b01886d654
fix 32bit android emulator
2016-07-01 21:41:32 +02:00
Nikolay Amiantov
87ebab128a
replace ${stdenv.cc.cc}/lib occurences
2016-05-01 00:13:23 +03:00
Nikolay Amiantov
8b7ebaffeb
replace makeSearchPath tree-wise to take care of possible multiple outputs
2016-04-13 22:09:41 +03:00
Thomas Tuegel
3ef7671cea
ncurses: combine $lib and $out outputs
...
The $lib output refers to the terminfo database in $out, which is about
10x larger than the ncurses shared library. Splitting these outputs
saves a small amount of space for any derivations that use the terminfo
database but not the ncurses library, but we do not have evidence that
any such exist.
2016-03-08 11:35:24 -06:00
Tuomas Tynkkynen
ed7dbb46a8
treewide: Mass replace 'zlib}/lib' to refer the 'out' output
2016-01-24 10:03:39 +02:00
Tuomas Tynkkynen
8eb5d7d037
treewide: Mass replace 'ncurses}/lib' to refer the 'lib' output
2016-01-24 10:03:38 +02:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
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
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +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
Vladimír Čunát
91407a8bdf
ncurses: split into multiple outputs
...
Some programs (e.g. tput) might better be moved somewhere else than
$dev/bin, but that can be improved later if need be.
2015-10-13 20:18:44 +02: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
f8c211fd2b
fontconfig: split into multiple outputs
...
Fixed all 'fontconfig}' references as well, hopefully, ugh!
2015-10-05 12:23:56 +02:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02: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
Vladimír Čunát
3b9ef2c71b
fix "libc}/lib" and similar references
...
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
2015-05-05 11:52:08 +02:00
taku0
d88736df6c
androidsdk: Make monitor and other commands to work
2015-05-03 23:03:36 +09:00