3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

144 commits

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