From 50d5ccc1b2740b28eba8ef458c94f86a2e83b191 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Tue, 16 Sep 2014 21:23:12 +0200 Subject: [PATCH] envsetup.sh: Fix handling of emulator prebuilts path. Due to a bad previous merge, everytime 'lunch' is called, a new instance of prebuilts/android-emulator// will be added to your PATH. This patch fixes the issue by removing the duplicate code that should have been removed during the merge. Note that android-emulator is still being added once to the PATH by code that appears before in the script. BUG=17524154 Change-Id: Iaa03159b0c81b15ef4c7c420e2f76e0a48aba789 --- envsetup.sh | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index 2c74b2d81..1798635a7 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -206,24 +206,6 @@ function setpaths() unset ANDROID_HOST_OUT export ANDROID_HOST_OUT=$(get_abs_build_var HOST_OUT) - # If prebuilts/android-emulator// exists, prepend it to our PATH - # to ensure that the corresponding 'emulator' binaries are used. - case $(uname -s) in - Darwin) - ANDROID_EMULATOR_PREBUILTS=$T/prebuilts/android-emulator/darwin-x86_64 - ;; - Linux) - ANDROID_EMULATOR_PREBUILTS=$T/prebuilts/android-emulator/linux-x86_64 - ;; - *) - ANDROID_EMULATOR_PREBUILTS= - ;; - esac - if [ -n "$ANDROID_EMULATOR_PREBUILTS" -a -d "$ANDROID_EMULATOR_PREBUILTS" ]; then - PATH=$ANDROID_EMULATOR_PREBUILTS:$PATH - export ANDROID_EMULATOR_PREBUILTS - fi - # needed for building linux on MacOS # TODO: fix the path #export HOST_EXTRACFLAGS="-I "$T/system/kernel_headers/host_include