diff options
| -rw-r--r-- | build-scripts/build-android | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android index a57379c..1dde60a 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -12,7 +12,7 @@ set -o errtrace git config --global user.email "android-build-bot@fake-email.com" git config --global user.name "android-build-bot" -if [ ! -n "$SOURCE_OVERLAY" ]; +if [ ! -n "$SOURCE_OVERLAY" ]; then echo "ERROR: Missing SOURCE_OVERLAY in the configuration." exit 1 @@ -61,7 +61,7 @@ else wget -nv --no-check-certificate $TOOLCHAIN_URL fi - # Remove any old local manifest and manifest which can break repo init if + # Remove any old local manifest and manifest which can break repo init if # duplicate repository are found or forceful manifest update rm -rf .repo/local_manifests .repo/manifest* @@ -209,10 +209,14 @@ else 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/ + [ -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/ + for i in lib64 prebuilt_include test; do + mkdir -p $PWD/prebuilts/clang/host/linux-x86/clang-master/${i} + cp -af $PWD/prebuilts/clang/host/linux-x86/$ANDROID_CLANGVER/${i}/* $PWD/prebuilts/clang/host/linux-x86/clang-master/${i}/ + done + export LLVM_PREBUILTS_VERSION=clang-master fi if [ -x "${TARGET_TOOLS_PREFIX}gcc" ]; then |