public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #95309 from obsidiansystems/mobile-fixes

Browse Source 
Support Android 29 in cross-compilation
This commit is contained in:
Matthew Bauer
2020-08-28 14:59:37 -05:00
committed by GitHub
parent 14d8030618 c5617381bc
commit d0e52b6b32
12 changed files with 84 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/mobile/androidenv/compose-android-packages.nix
+1 -1
View File
@@ -14,7 +14,7 @@
, lldbVersions ? [ ]
, cmakeVersions ? [ ]
, includeNDK ? false
, ndkVersion ? "18.1.5063045"
, ndkVersion ? "21.0.6113669"
, useGoogleAPIs ? false
, useGoogleTVAddOns ? false
, includeExtras ? []
pkgs/development/mobile/androidenv/generated/addons.nix
-128
View File
@@ -672,70 +672,6 @@
};
"extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = {
name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4";
path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4";
revision = "1";
displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4";
archives = {
all = fetchurl {
url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip";
sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8";
};
};
};
"extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = {
name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4";
path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4";
revision = "1";
displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4";
archives = {
all = fetchurl {
url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip";
sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8";
};
};
};
"extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = {
name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4";
path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4";
revision = "1";
displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4";
archives = {
all = fetchurl {
url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip";
sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8";
};
};
};
"extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = {
name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8";
path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8";
revision = "1";
displayName = "Solver for ConstraintLayout 1.0.0-alpha8";
archives = {
all = fetchurl {
url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip";
sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a";
};
};
};
"extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = {
name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8";
path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8";
@@ -896,70 +832,6 @@
};
"extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = {
name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4";
path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4";
revision = "1";
displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4";
archives = {
all = fetchurl {
url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip";
sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe";
};
};
};
"extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = {
name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4";
path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4";
revision = "1";
displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4";
archives = {
all = fetchurl {
url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip";
sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe";
};
};
};
"extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = {
name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4";
path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4";
revision = "1";
displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4";
archives = {
all = fetchurl {
url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip";
sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe";
};
};
};
"extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = {
name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8";
path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8";
revision = "1";
displayName = "ConstraintLayout for Android 1.0.0-alpha8";
archives = {
all = fetchurl {
url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip";
sha1 = "7912ba03b04831f918f523648f118c4ee4da7604";
};
};
};
"extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = {
name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8";
path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8";
pkgs/development/mobile/androidenv/ndk-bundle/default.nix
+4 -2
View File
@@ -7,12 +7,14 @@ deployAndroidPackage {
inherit package os;
buildInputs = [ autoPatchelfHook makeWrapper pkgs.python2 ]
++ 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 .
'' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) ''
patch -p1 \
--no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch}
wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
'' + ''
# TODO: allow this stuff
rm -rf docs tests
@@ -46,6 +48,6 @@ deployAndroidPackage {
do
ln -sf ../libexec/android-sdk/ndk-bundle/$i $out/bin/$i
done
'';
'');
noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script
}