Merge pull request #80107 from phryneas/fix-build-tools

androidenv build-tools: fix old versions under linux
This commit is contained in:
Matthew Bauer
2020-02-14 13:35:04 -05:00
committed by GitHub

View File

@@ -7,8 +7,10 @@ deployAndroidPackage {
patchInstructions = ''
${lib.optionalString (os == "linux") ''
addAutoPatchelfSearchPath $packageBaseDir/lib
addAutoPatchelfSearchPath $packageBaseDir/lib64
autoPatchelf --no-recurse $packageBaseDir/lib64
if [[ -d $packageBaseDir/lib64 ]]; then
addAutoPatchelfSearchPath $packageBaseDir/lib64
autoPatchelf --no-recurse $packageBaseDir/lib64
fi
autoPatchelf --no-recurse $packageBaseDir
''}