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

2022-08-17 14:21:32 +02:00
parent b22227b346 8cf6dd815f
commit 55354feded
1 changed files with 4 additions and 2 deletions
@@ -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
 }