StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "envsetup.sh: Fix handling of emulator prebuilts path." into lmp-dev

Browse Source
This commit is contained in:
David 'Digit' Turner
2014-09-16 19:33:36 +00:00
committed by Android (Google) Code Review
parent 7a8991991f 50d5ccc1b2
commit d036711427
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
envsetup.sh
View File

@@ -206,24 +206,6 @@ function setpaths()
unset ANDROID_HOST_OUT unset ANDROID_HOST_OUT
export ANDROID_HOST_OUT=$(get_abs_build_var HOST_OUT) export ANDROID_HOST_OUT=$(get_abs_build_var HOST_OUT)
# If prebuilts/android-emulator/<system>/ 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 # needed for building linux on MacOS
# TODO: fix the path # TODO: fix the path
#export HOST_EXTRACFLAGS="-I "$T/system/kernel_headers/host_include #export HOST_EXTRACFLAGS="-I "$T/system/kernel_headers/host_include