ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

android: update sdk, ndk to 29, 21

Browse Source
This commit is contained in:
Matthew Bauer 2020-08-13 01:10:21 -04:00 committed by Matthew Bauer
parent b8e06b40d2
commit 074bc78cc8
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/systems/examples.nix
View File

@ -46,7 +46,7 @@ rec {
armv7a-android-prebuilt = { armv7a-android-prebuilt = {
config = "armv7a-unknown-linux-androideabi"; config = "armv7a-unknown-linux-androideabi";
sdkVer = "24"; sdkVer = "29";
ndkVer = "18b"; ndkVer = "18b";
platform = platforms.armv7a-android; platform = platforms.armv7a-android;
useAndroidPrebuilt = true; useAndroidPrebuilt = true;
@ -54,7 +54,7 @@ rec {
aarch64-android-prebuilt = { aarch64-android-prebuilt = {
config = "aarch64-unknown-linux-android"; config = "aarch64-unknown-linux-android";
sdkVer = "24"; sdkVer = "29";
ndkVer = "18b"; ndkVer = "18b";
platform = platforms.aarch64-multiplatform; platform = platforms.aarch64-multiplatform;
useAndroidPrebuilt = true; useAndroidPrebuilt = true;

7
pkgs/development/androidndk-pkgs/default.nix
View File

@ -2,9 +2,9 @@
}: }:
{ {
"18b" = "21" =
let let
ndkVersion = "18.1.5063045"; ndkVersion = "21.0.6113669";
buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages { buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages {
includeNDK = true; includeNDK = true;
@ -28,6 +28,7 @@
# these two really are the same. # these two really are the same.
buildAndroidndk = buildAndroidComposition.ndk-bundle; buildAndroidndk = buildAndroidComposition.ndk-bundle;
androidndk = androidComposition.ndk-bundle; androidndk = androidComposition.ndk-bundle;
targetAndroidndkPkgs = targetPackages.androidndkPkgs_18b; targetAndroidndkPkgs = targetPackages.androidndkPkgs_21;
}; };
} }

2
pkgs/development/mobile/androidenv/compose-android-packages.nix
View File

@ -14,7 +14,7 @@
, lldbVersions ? [ ] , lldbVersions ? [ ]
, cmakeVersions ? [ ] , cmakeVersions ? [ ]
, includeNDK ? false , includeNDK ? false
, ndkVersion ? "18.1.5063045" , ndkVersion ? "21.0.6113669"
, useGoogleAPIs ? false , useGoogleAPIs ? false
, useGoogleTVAddOns ? false , useGoogleTVAddOns ? false
, includeExtras ? [] , includeExtras ? []

6
pkgs/development/mobile/androidenv/ndk-bundle/default.nix
View File

@ -7,12 +7,14 @@ deployAndroidPackage {
inherit package os; inherit package os;
buildInputs = [ autoPatchelfHook makeWrapper pkgs.python2 ] buildInputs = [ autoPatchelfHook makeWrapper pkgs.python2 ]
++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out ]; ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out ];
patchInstructions = lib.optionalString (os == "linux") '' patchInstructions = lib.optionalString (os == "linux") (''
patchShebangs . patchShebangs .
'' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) ''
patch -p1 \ patch -p1 \
--no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch}
wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
'' + ''
# TODO: allow this stuff # TODO: allow this stuff
rm -rf docs tests rm -rf docs tests
@ -46,6 +48,6 @@ deployAndroidPackage {
do do
ln -sf ../libexec/android-sdk/ndk-bundle/$i $out/bin/$i ln -sf ../libexec/android-sdk/ndk-bundle/$i $out/bin/$i
done done
''; '');
noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script
} }

1
pkgs/top-level/all-packages.nix
View File

@ -1155,6 +1155,7 @@ in
androidndkPkgs = androidndkPkgs_18b; androidndkPkgs = androidndkPkgs_18b;
androidndkPkgs_18b = (callPackage ../development/androidndk-pkgs {})."18b"; androidndkPkgs_18b = (callPackage ../development/androidndk-pkgs {})."18b";
androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs {})."21";
androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk; androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk;