Merge pull request #185663 from chvp/androidenv-build-tools-33

This commit is contained in:
Sandro 2022-08-17 14:21:32 +02:00 committed by GitHub
commit 55354feded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -14,8 +14,10 @@ deployAndroidPackage {
autoPatchelf --no-recurse $packageBaseDir
''}
wrapProgram $PWD/mainDexClasses \
--prefix PATH : ${pkgs.jdk8}/bin
${lib.optionalString (lib.toInt (lib.versions.major package.revision) < 33) ''
wrapProgram $PWD/mainDexClasses \
--prefix PATH : ${pkgs.jdk8}/bin
''}
'';
noAuditTmpdir = true; # The checker script gets confused by the build-tools path that is incorrectly identified as a reference to /build
}