Unverified Commit 42e98b33 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #195752 from sheldonneuberger-sc/snn-android-ndk

parents dcb0e1f6 a5f43691

pkgs/development/mobile/androidenv/ndk-bundle/default.nix

+10 −6
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ deployAndroidPackage { 
    ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];

  autoPatchelfIgnoreMissingDeps = true;

  buildInputs = lib.optionals (os == "linux") [ pkgs.zlib ];

  patchInstructions = lib.optionalString (os == "linux") (''

  patchInstructions = ''

    patchShebangs .



    # TODO: allow this stuff
@@ -37,9 +37,11 @@ deployAndroidPackage { 
        addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64

    fi



    find toolchains -type d -name bin -or -name lib64 | while read dir; do

    if [ -d toolchains/llvm/prebuilt/linux-x86_64 ]; then

        find toolchains/llvm/prebuilt/linux-x86_64 -type d -name bin -or -name lib64 | while read dir; do

            autoPatchelf "$dir"

        done

    fi



    # fix ineffective PROGDIR / MYNDKDIR determination

    for progname in ndk-build; do
@@ -47,7 +49,9 @@ deployAndroidPackage { 
    done



    # Patch executables

    if [ -d prebuild/linux-x86_64 ]; then

        autoPatchelf prebuilt/linux-x86_64

    fi



    # wrap

    for progname in ndk-build; do
@@ -59,6 +63,6 @@ deployAndroidPackage { 
    for progname in ndk-build; do

        ln -sf ../libexec/android-sdk/ndk-bundle/$progname $out/bin/$progname

    done

  '');

  '';

  noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script

}