diff options
| -rw-r--r-- | build-scripts/build-android | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android index a1e648a..b35b80a 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -199,6 +199,16 @@ 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 external_tarballs/$(basename ${CLANG_TOOLCHAIN_URL} .tar.xz)/* 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 |