androidenv: fix build of build-tools >= 33

mainDexClasses seems to have been removed in this version of build-tools. (Seems
to, because the release notes are not updated at all, unfortunately:
https://developer.android.com/studio/releases/build-tools).
This commit is contained in:
Charlotte Van Petegem 2022-08-08 15:03:08 +02:00
parent 985524984f
commit 8cf6dd815f
No known key found for this signature in database
GPG Key ID: 019E764B7184435A

View File

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