JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
158,143 Commits 2 Branches 0 Tags 13 GiB
d2c38d1eef
Commit Graph

165 Commits

Author SHA1 Message Date
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
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