Unverified Commit a99c3349 authored by Axel Karjalainen's avatar Axel Karjalainen Committed by GitHub
Browse files

treewide: Fix remaining Android sdkVer and ndkVer references (#341106) 

Fix remaining sdkVer and ndkVer references

1144d46f renamed sdkVer and ndkVer, but forgot one reference and
incorrectly replaced another
parent e9bb8e91

pkgs/build-support/cc-wrapper/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ stdenvNoCC.mkDerivation { 
    ''



    + optionalString targetPlatform.isAndroid ''

      echo "-D__ANDROID_API__=${targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags

      echo "-D__ANDROID_API__=${targetPlatform.androidSdkVersion}" >> $out/nix-support/cc-cflags

    ''



    # There are a few tools (to name one libstdcxx5) which do not work

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -19448,7 +19448,7 @@ with pkgs; 














  # TODO(@Ericson2314): Build bionic libc from source















  bionic = if stdenv.hostPlatform.useAndroidPrebuilt













    then pkgs."androidndkPkgs_${stdenv.hostPlatform.androidNdkVer}".libraries













    then pkgs."androidndkPkgs_${stdenv.hostPlatform.androidNdkVersion}".libraries















    else callPackage ../os-specific/linux/bionic-prebuilt { };





























  boolstuff = callPackage ../development/libraries/boolstuff { };