aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinSeong Kim <minseong.kim@linaro.org>2018-02-21 05:59:27 +0000
committerMinSeong Kim <minseong.kim@linaro.org>2018-02-21 05:59:27 +0000
commit908976b61f077752838f1d21d4e12f78f9dcd191 (patch)
tree926eca514de6a35b0c20843e781c2e298eaf1e26
parentc651f6bbc52d7a1507e960f69e16c4be7310265b (diff)
downloadlinaro-android-build-tools-908976b61f077752838f1d21d4e12f78f9dcd191.tar.gz
Update for aosp master build with clang master
Prebuilt clang version string is moved. Change-Id: Ifa1df7b6de84aaf0d24c748424bd91e6225a0efe
-rw-r--r--build-scripts/build-android4
1 files changed, 3 insertions, 1 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android
index 10512b2..e0aa26f 100644
--- a/build-scripts/build-android
+++ b/build-scripts/build-android
@@ -208,7 +208,9 @@ else
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)
+ # ANDROID_CLANGVER=$(gawk '{ if ($1 == "LLVM_PREBUILTS_VERSION") print $3 }' $PWD/build/core/clang/versions.mk)
+ ANDROID_CLANGVER=$(gawk '{ if ($1 == "ClangDefaultVersion") print $3 }' $AOSPDIR/build/soong/cc/config/global.go)
+ ANDROID_CLANGVER=$(echo ${ANDROID_CLANGVER//'"'})
[ -z $ANDROID_CLANGVER ] && ANDROID_CLANGVER=clang-4053586 # aosp prebuilt build number at 2017/10/11 master
mkdir -p $PWD/prebuilts/clang/host/linux-x86/clang-master
cp -r external_tarballs/$(basename ${CLANG_TOOLCHAIN_URL} .tar.xz)/* $PWD/prebuilts/clang/host/linux-x86/clang-master/