Merge "Don't add empty entry to PATH."
This commit is contained in:
commit
0c8b471be3
1 changed files with 6 additions and 1 deletions
|
@ -227,7 +227,12 @@ function setpaths()
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export ANDROID_DEV_SCRIPTS=$T/development/scripts:$T/prebuilts/devtools/tools:$T/external/selinux/prebuilts/bin
|
export ANDROID_DEV_SCRIPTS=$T/development/scripts:$T/prebuilts/devtools/tools:$T/external/selinux/prebuilts/bin
|
||||||
export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_TOOLCHAIN:$ANDROID_TOOLCHAIN_2ND_ARCH:$ANDROID_DEV_SCRIPTS:
|
ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_TOOLCHAIN
|
||||||
|
if [ -n "$ANDROID_TOOLCHAIN_2ND_ARCH" ]; then
|
||||||
|
ANDROID_BUILD_PATHS=$ANDROID_BUILD_PATHS:$ANDROID_TOOLCHAIN_2ND_ARCH
|
||||||
|
fi
|
||||||
|
ANDROID_BUILD_PATHS=$ANDROID_BUILD_PATHS:$ANDROID_DEV_SCRIPTS:
|
||||||
|
export ANDROID_BUILD_PATHS
|
||||||
|
|
||||||
# If prebuilts/android-emulator/<system>/ exists, prepend it to our PATH
|
# If prebuilts/android-emulator/<system>/ exists, prepend it to our PATH
|
||||||
# to ensure that the corresponding 'emulator' binaries are used.
|
# to ensure that the corresponding 'emulator' binaries are used.
|
||||||
|
|
Loading…
Reference in a new issue