diff --git a/extract_utils.sh b/extract_utils.sh index b531d4d..53d926f 100644 --- a/extract_utils.sh +++ b/extract_utils.sh @@ -94,8 +94,19 @@ function setup_vendor() { VENDOR_RADIO_STATE=0 fi + export BINARIES_LOCATION="$ANDROID_ROOT"/prebuilts/extract-tools/${HOST}-x86/bin + + for version in 0_8 0_9; do + export PATCHELF_${version}="$BINARIES_LOCATION"/patchelf-"${version}" + done + + if [ -z "$PATCHELF_VERSION" ]; then + export PATCHELF_VERSION=0_9 + fi + if [ -z "$PATCHELF" ]; then - export PATCHELF="$ANDROID_ROOT"/prebuilts/extract-tools/${HOST}-x86/bin/patchelf + local patchelf_variable="PATCHELF_${PATCHELF_VERSION}" + export PATCHELF=${!patchelf_variable} fi }