diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-14 16:27:18 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-14 17:02:32 -0800 |
| commit | bb02bdf737ba8511177e2aee1f722e0ce5f14f2e (patch) | |
| tree | 77fcad874f4f2494e20dd3363094246a05efee35 | |
| parent | af11d9e17d52d9bb931448f1922e37512fb5a7fc (diff) | |
| download | 3.5-bb02bdf737ba8511177e2aee1f722e0ce5f14f2e.tar.gz | |
Update update.sh to copy in ASAN prebuilts.HEADandroid-wear-5.0.0_r1master-soongmastermainlollipop-wear-release
Change-Id: Id65783a5df292d69c3281e5f5a98e1709a616c7a
| -rwxr-xr-x | update.sh | 16 |
1 files changed, 15 insertions, 1 deletions
@@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e # Copy binaries for b in bin/*; do @@ -24,6 +24,9 @@ for i in `find ${ANDROID_BUILD_TOP}/external/clang/lib/Headers -mindepth 1 ! -na cp -a $i lib/clang/*/include/ done +echo Copying sanitizer headers +cp -a ${ANDROID_BUILD_TOP}/external/compiler-rt/include/sanitizer lib/clang/*/include/ + # Copy over stdatomic.h from bionic echo Copying stdatomic.h cp -a ${ANDROID_BUILD_TOP}/bionic/libc/include/stdatomic.h lib/clang/*/include/ @@ -31,3 +34,14 @@ cp -a ${ANDROID_BUILD_TOP}/bionic/libc/include/stdatomic.h lib/clang/*/include/ echo Copying arm_neon.h cp -a `find ${ANDROID_PRODUCT_OUT} -name arm_neon.h` lib/clang/*/include +echo Copying ASan libraries +LIBS=$(echo lib/clang/*)/lib/linux +cp -a ${ANDROID_HOST_OUT}/obj/STATIC_LIBRARIES/libasan_intermediates/libasan.a \ + ${LIBS}/libclang_rt.asan-x86_64.a +cp -a ${ANDROID_HOST_OUT}/obj/STATIC_LIBRARIES/libasan_cxx_intermediates/libasan_cxx64.a \ + ${LIBS}/libclang_rt.asan_cxx-x86_64.a +cp -a ${ANDROID_HOST_OUT}/obj32/STATIC_LIBRARIES/libasan_intermediates/libasan.a \ + ${LIBS}/libclang_rt.asan-i386.a +cp -a ${ANDROID_HOST_OUT}/obj32/STATIC_LIBRARIES/libasan_cxx_intermediates/libasan_cxx32.a \ + ${LIBS}/libclang_rt.asan_cxx-i386.a + |