aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2016-11-16 09:17:40 +0000
committerVishal Bhoj <vishal.bhoj@linaro.org>2016-11-16 09:17:40 +0000
commit681b7a7bcc68f4d86e017814a7b92103df7249ca (patch)
treeca9567d35d4a48eedc72fa5d0c069212b8d16e6c
parent10314d0c3c7c9f1d79524b98c3c6037abf4efbe3 (diff)
downloadlinaro-android-build-tools-681b7a7bcc68f4d86e017814a7b92103df7249ca.tar.gz
Revert "build-android: support for external clang toolchain"
This reverts commit 10314d0c3c7c9f1d79524b98c3c6037abf4efbe3. Change-Id: I9b85f73c149b4488e114df08538959f3ee6a5ce9
-rw-r--r--build-scripts/build-android10
1 files changed, 0 insertions, 10 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android
index 74aa7a4..a1e648a 100644
--- a/build-scripts/build-android
+++ b/build-scripts/build-android
@@ -199,16 +199,6 @@ else
unpack_external_tarball "$EXTERNAL_TARBALL"
fi
- if [ -n "$CLANG_TOOLCHAIN_URL" ]; then
- unpack_external_tarball "$CLANG_TOOLCHAIN_URL"
- # Adapt to the aosp toolchain directory hierarchy - compile error otherwise
- ANDROID_CLANGVER=$(gawk '{ if ($1 == "LLVM_PREBUILTS_VERSION") print $3 }' $PWD/build/core/clang/versions.mk)
- [ -z $ANDROID_CLANGVER ] && ANDROID_CLANGVER=clang-3217047 # aosp prebuilt build number at 2016/10/20 master
- mkdir -p upstream_clang/linux-x86/$ANDROID_CLANGVER/
- cp -r $(basename ${CLANG_TOOLCHAIN_URL})/* upstream_clang/linux-x86/$ANDROID_CLANGVER/
- export LLVM_PREBUILTS_BASE=${PWD}/upstream_clang/
- fi
-
if [ -x "${TARGET_TOOLS_PREFIX}gcc" ]; then
${TARGET_TOOLS_PREFIX}gcc -v
fi