OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[asan] Support Android/x86 in asan_device_setup. 

llvm-svn: 218968
This commit is contained in:
Evgeniy Stepanov 2014-10-03 08:57:11 +00:00
parent 36a3e69bd4
commit 0b9109c803
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
compiler-rt/lib/asan/scripts/asan_device_setup
View File

@ -1,4 +1,4 @@
#!/bin/bash -e #!/bin/bash
#===- lib/asan/scripts/asan_device_setup -----------------------------------===# #===- lib/asan/scripts/asan_device_setup -----------------------------------===#
# #
# The LLVM Compiler Infrastructure # The LLVM Compiler Infrastructure
@ -10,6 +10,7 @@
# #
#===------------------------------------------------------------------------===# #===------------------------------------------------------------------------===#
set -e
HERE="$(cd "$(dirname "$0")" && pwd)" HERE="$(cd "$(dirname "$0")" && pwd)"
@ -29,6 +30,21 @@ function usage {
exit 1 exit 1
} }
function get_device_arch { # OUTVAR
local _outvar=$1
local _ABI=$($ADB shell getprop ro.product.cpu.abi)
local _ARCH=
if [[ $_ABI == x86* ]]; then
_ARCH=i686
elif [[ $_ABI == armeabi* ]]; then
_ARCH=arm
else
echo "Unrecognized device ABI: $_ABI"
exit 1
fi
eval $_outvar=\$_ARCH
}
while [[ $# > 0 ]]; do while [[ $# > 0 ]]; do
case $1 in case $1 in
--revert) --revert)
@ -70,13 +86,17 @@ if [[ x$device != x ]]; then
ADB="$ADB -s $device" ADB="$ADB -s $device"
fi fi
ASAN_RT="libclang_rt.asan-arm-android.so" echo '>> Remounting /system rw'
$ADB root
$ADB wait-for-device
$ADB remount
get_device_arch ARCH
echo 'Target architecture: $ARCH'
ASAN_RT="libclang_rt.asan-$ARCH-android.so"
if [[ x$revert == xyes ]]; then if [[ x$revert == xyes ]]; then
echo '>> Uninstalling ASan' echo '>> Uninstalling ASan'
$ADB root
$ADB wait-for-device
$ADB remount
if ! $ADB shell readlink /system/bin/app_process | grep 'app_process' >&/dev/null; then if ! $ADB shell readlink /system/bin/app_process | grep 'app_process' >&/dev/null; then
echo '>> Pre-L device detected.' echo '>> Pre-L device detected.'
@ -124,11 +144,6 @@ TMPDIROLD="$TMPDIRBASE/old"
TMPDIR="$TMPDIRBASE/new" TMPDIR="$TMPDIRBASE/new"
mkdir "$TMPDIROLD" mkdir "$TMPDIROLD"
echo '>> Remounting /system rw'
$ADB root
$ADB wait-for-device
$ADB remount
RELEASE=$($ADB shell getprop ro.build.version.release) RELEASE=$($ADB shell getprop ro.build.version.release)
PRE_L=0 PRE_L=0
if echo "$RELEASE" | grep '^4\.' >&/dev/null; then if echo "$RELEASE" | grep '^4\.' >&/dev/null; then
@ -150,7 +165,7 @@ fi
echo '>> Copying files from the device' echo '>> Copying files from the device'
$ADB pull /system/bin/app_process.wrap "$TMPDIROLD" || true $ADB pull /system/bin/app_process.wrap "$TMPDIROLD" || true
$ADB pull /system/bin/asanwrapper "$TMPDIROLD" || true $ADB pull /system/bin/asanwrapper "$TMPDIROLD" || true
$ADB pull /system/lib/libclang_rt.asan-arm-android.so "$TMPDIROLD" || true $ADB pull /system/lib/"$ASAN_RT" "$TMPDIROLD" || true
cp -r "$TMPDIROLD" "$TMPDIR" cp -r "$TMPDIROLD" "$TMPDIR"
if [[ -f "$TMPDIR/app_process.wrap" ]]; then if [[ -f "$TMPDIR/app_process.wrap" ]]; then
@ -180,7 +195,7 @@ fi
cat <<EOF >"$TMPDIR/app_process.wrap" cat <<EOF >"$TMPDIR/app_process.wrap"
#!/system/bin/sh-from-zygote #!/system/bin/sh-from-zygote
ASAN_OPTIONS=$ASAN_OPTIONS \\ ASAN_OPTIONS=$ASAN_OPTIONS \\
LD_PRELOAD=\$LD_PRELOAD:libclang_rt.asan-arm-android.so \\ LD_PRELOAD=\$LD_PRELOAD:$ASAN_RT \\
exec /system/bin/app_process32 \$@ exec /system/bin/app_process32 \$@
EOF EOF
@ -189,7 +204,7 @@ EOF
# zygote). # zygote).
cat <<EOF >"$TMPDIR/asanwrapper" cat <<EOF >"$TMPDIR/asanwrapper"
#!/system/bin/sh #!/system/bin/sh
LD_PRELOAD=libclang_rt.asan-arm-android.so \\ LD_PRELOAD=$ASAN_RT \\
exec \$@ exec \$@
EOF EOF