This is an archive of the discontinued LLVM Phabricator instance.

Differential D100505

Fix android-x86 library name in asan_device_setup.
ClosedPublic

Authored by eugenis on Apr 14 2021, 1:15 PM.

Details

Reviewers
hans
Commits
rGfbb9132e71a2: Fix android-x86 library name in asan_device_setup.
Summary

https://reviews.llvm.org/D26764 removed i686 variants of compiler-rt
libraries and canonicalized the i386 name.

https://reviews.llvm.org/D37278 partially reverted the previous change
to keep i686 name on Android, but did not update asan_device_setup
script.

This changes fixes asan_device_setup.

Diff Detail

Event Timeline

eugenis created this revision.Apr 14 2021, 1:15 PM
Herald added a subscriber: danielkiss. · View Herald TranscriptApr 14 2021, 1:15 PM
eugenis requested review of this revision.Apr 14 2021, 1:15 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 14 2021, 1:15 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B98748: Diff 337534.Apr 14 2021, 2:18 PM
hans accepted this revision.Apr 19 2021, 2:10 AM
This revision is now accepted and ready to land.Apr 19 2021, 2:10 AM
Closed by commit rGfbb9132e71a2: Fix android-x86 library name in asan_device_setup. (authored by eugenis). · Explain WhyApr 19 2021, 5:40 PM
This revision was automatically updated to reflect the committed changes.
eugenis added a commit: rGfbb9132e71a2: Fix android-x86 library name in asan_device_setup..

Revision Contents

PathSize
compiler-rt/
lib/
asan/
scripts/
2 lines

Diff 338676

compiler-rt/lib/asan/scripts/asan_device_setup

Show First 20 Lines • Show All 88 Lines • ▼ Show 20 Lines
function get_device_arch { # OUT OUT64 function get_device_arch { # OUT OUT64
local _outvar=$1 local _outvar=$1
local _outvar64=$2 local _outvar64=$2
local _ABI=$(adb_shell getprop ro.product.cpu.abi) local _ABI=$(adb_shell getprop ro.product.cpu.abi)
local _ARCH= local _ARCH=
local _ARCH64= local _ARCH64=
if [[ $_ABI == x86* ]]; then if [[ $_ABI == x86* ]]; then
_ARCH=i386 _ARCH=i686
elif [[ $_ABI == armeabi* ]]; then elif [[ $_ABI == armeabi* ]]; then
_ARCH=arm _ARCH=arm
elif [[ $_ABI == arm64-v8a* ]]; then elif [[ $_ABI == arm64-v8a* ]]; then
_ARCH=arm _ARCH=arm
_ARCH64=aarch64 _ARCH64=aarch64
else else
echo "Unrecognized device ABI: $_ABI" echo "Unrecognized device ABI: $_ABI"
exit 1 exit 1
▲ Show 20 Lines • Show All 361 Lines • Show Last 20 Lines