am 744e4aa2: am e624fd28: Merge "Put prebuilt emulator path after host output"

* commit '744e4aa228b4ad25d444acb020ee3816fd2c2eb1':
  Put prebuilt emulator path after host output
This commit is contained in:
Ji-Hwan Lee
2014-05-18 07:18:27 +00:00
committed by Android Git Automerger

View File

@@ -187,7 +187,7 @@ function setpaths()
;; ;;
esac esac
if [ -n "$ANDROID_EMULATOR_PREBUILTS" -a -d "$ANDROID_EMULATOR_PREBUILTS" ]; then if [ -n "$ANDROID_EMULATOR_PREBUILTS" -a -d "$ANDROID_EMULATOR_PREBUILTS" ]; then
ANDROID_BUILD_PATHS=$ANDROID_EMULATOR_PREBUILTS:$ANDROID_BUILD_PATHS ANDROID_BUILD_PATHS=$ANDROID_BUILD_PATHS:$ANDROID_EMULATOR_PREBUILTS
export ANDROID_EMULATOR_PREBUILTS export ANDROID_EMULATOR_PREBUILTS
fi fi