aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2015-09-14 19:32:50 -0700
committerYing Wang <wangying@google.com>2015-09-14 19:32:50 -0700
commit750396dd30e8636e82a6edb7c76a162f2d07a969 (patch)
tree3082ec63ea6c429019f29abd345f5063b648364d
parentb384eb84c3bbea9630d805f5825320e7f9acc2ba (diff)
downloadplatform_build-750396dd30e8636e82a6edb7c76a162f2d07a969.tar.gz
platform_build-750396dd30e8636e82a6edb7c76a162f2d07a969.tar.bz2
platform_build-750396dd30e8636e82a6edb7c76a162f2d07a969.zip
Remove legacy kernel build toolchain PATH setup in envsetup.sh
We used to rely on envsetup.sh to set up PATH before doing kernel build. Now we have new kernel build process. Also the variable doesn't work any more as we don't have corresponding arm-eabi toolchain for the latest arm-linux-androideabi toolchain. Change-Id: I99443fdc58e94f57f4f1f7e88da6dd127f3b2fac
-rw-r--r--envsetup.sh17
1 files changed, 1 insertions, 16 deletions
diff --git a/envsetup.sh b/envsetup.sh
index 3c29e88851..fa4e2d69f0 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -161,23 +161,8 @@ function setpaths()
export ANDROID_TOOLCHAIN_2ND_ARCH=$gccprebuiltdir/$toolchaindir2
fi
- unset ANDROID_KERNEL_TOOLCHAIN_PATH
- case $ARCH in
- arm)
- # Legacy toolchain configuration used for ARM kernel compilation
- toolchaindir=arm/arm-eabi-$targetgccversion/bin
- if [ -d "$gccprebuiltdir/$toolchaindir" ]; then
- export ARM_EABI_TOOLCHAIN="$gccprebuiltdir/$toolchaindir"
- ANDROID_KERNEL_TOOLCHAIN_PATH="$ARM_EABI_TOOLCHAIN":
- fi
- ;;
- *)
- # No need to set ARM_EABI_TOOLCHAIN for other ARCHs
- ;;
- esac
-
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_KERNEL_TOOLCHAIN_PATH$ANDROID_DEV_SCRIPTS:
+ export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_TOOLCHAIN:$ANDROID_TOOLCHAIN_2ND_ARCH:$ANDROID_DEV_SCRIPTS:
# If prebuilts/android-emulator/<system>/ exists, prepend it to our PATH
# to ensure that the corresponding 'emulator' binaries are used.