diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-04-28 15:54:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-28 15:54:24 +0000 |
| commit | 7250b63a1a3e726aa83e2351b23f2d0c79903247 (patch) | |
| tree | b79eef8175a644d790678fc6336c0c212a497679 | |
| parent | 676e11fed82c5a4afb02d1082472fad14e625915 (diff) | |
| parent | f24c356a968e13d03f80df9840fe0a9b2652f872 (diff) | |
| download | build-7250b63a1a3e726aa83e2351b23f2d0c79903247.tar.gz | |
Merge "Fix PATH setup for arm64."
| -rw-r--r-- | envsetup.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/envsetup.sh b/envsetup.sh index 3b9423b67f..f75bf88599 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -115,7 +115,6 @@ function setpaths() fi # and in with the new - CODE_REVIEWS= prebuiltdir=$(getprebuilt) gccprebuiltdir=$(get_abs_build_var ANDROID_GCC_PREBUILTS) @@ -160,12 +159,10 @@ function setpaths() # Legacy toolchain configuration used for ARM kernel compilation toolchaindir=arm/arm-eabi-$targetgccversion/bin if [ -d "$gccprebuiltdir/$toolchaindir" ]; then - ANDROID_KERNEL_TOOLCHAIN_PATH="$gccprebuiltdir/$toolchaindir" - export ARM_EABI_TOOLCHAIN=$ANDROID_KERNEL_TOOLCHAIN_PATH + export ARM_EABI_TOOLCHAIN="$gccprebuiltdir/$toolchaindir" + ANDROID_KERNEL_TOOLCHAIN_PATH="$ARM_EABI_TOOLCHAIN": fi ;; - mips) toolchaindir=mips/mips-eabi-4.4.3/bin - ;; *) # No need to set ARM_EABI_TOOLCHAIN for other ARCHs ;; @@ -173,7 +170,7 @@ function setpaths() export ANDROID_QTOOLS=$T/development/emulator/qtools export ANDROID_DEV_SCRIPTS=$T/development/scripts:$T/prebuilts/devtools/tools - export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_KERNEL_TOOLCHAIN_PATH$CODE_REVIEWS:$ANDROID_DEV_SCRIPTS: + export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_KERNEL_TOOLCHAIN_PATH$ANDROID_DEV_SCRIPTS: export PATH=$ANDROID_BUILD_PATHS$PATH unset ANDROID_JAVA_TOOLCHAIN |